log tests/test-merge6 @ 4010:e282448d68f1

age author description
Thu, 30 Nov 2006 22:38:48 -0600 Matt Mackall make manifest friendlier
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
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.