-----------------------------------------------------------------
Revision: de63bb0da4e2be138b3d64dfa7188b7798253f7d
Ancestor: d0b88107c3efa4199675d63df9b4d288821fe3f7
Author: Timothy Brownawell <[email protected]>
Date: 2009-06-17T12:34:48
Branch: net.venge.monotone.keys-by-hash
Modified files:
tests/creating_a_bad_criss-cross_merge/alice.lua
tests/creating_a_bad_criss-cross_merge/bob.lua
ChangeLog:
Fix bad criss-cross merge test.
monotone --db={your.database} diff
--revision=d0b88107c3efa4199675d63df9b4d288821fe3f7
--revision=de63bb0da4e2be138b3d64dfa7188b7798253f7d
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
