log tests/test-merge7 @ 2181:690da72b0b16

age author description
Mon, 13 Mar 2006 13:05:41 +0100 Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Tue, 27 Sep 2005 14:53:11 -0700 Matt Mackall Make test-merge7 repeatable
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases