log tests/test-conflict.out @ 3391:defadc26e674

age author description
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)
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, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS
Sat, 30 Jul 2005 08:35:29 -0800 mpm Merge with TAH
Fri, 29 Jul 2005 15:21:02 +0100 Thomas Arendsen Hein Updated output of tests.
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u
Thu, 21 Jul 2005 12:40:28 -0500 mpm Update test output for status change
Sat, 02 Jul 2005 22:54:35 -0800 mpm options: kill -d for debug
Fri, 17 Jun 2005 08:50:55 -0800 mpm Tidy up conflict and pull tests
Wed, 15 Jun 2005 21:13:49 -0800 mpm Merge with TAH
Wed, 15 Jun 2005 21:12:28 -0800 mpm update tests to reflect new short hash length
Wed, 15 Jun 2005 00:27:20 -0800 mpm merge3: fix argument order