tests/test-merge-revert2.out
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Wed, 16 Jan 2008 11:14:24 -0600 Matt Mackall diff: don't show function name by default
Sat, 28 Apr 2007 17:55:45 -0300 Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Mon, 11 Dec 2006 18:09:52 +0100 Thomas Arendsen Hein Add instructions how to redo/finish failed merge with local working directory.
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)
Fri, 31 Mar 2006 10:37:25 -0800 Vadim Gelfer rewrite revert command. fix issues 93, 123, 147.
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, 24 Jan 2006 15:02:10 +1300 mason Add new bdiff based unidiff generation.
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick
Sat, 13 Aug 2005 19:43:42 -0800 mpm Merge with BOS
Sat, 13 Aug 2005 15:26:32 -0800 Bryan O'Sullivan Merge walk changes with Matt's tip.
Sat, 13 Aug 2005 15:23:06 -0800 Bryan O'Sullivan Merge with TAH.
Fri, 12 Aug 2005 23:54:09 -0800 mpm Merge with TAH
Wed, 10 Aug 2005 08:23:42 +0100 Thomas Arendsen Hein Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Wed, 10 Aug 2005 06:47:46 +0100 Thomas Arendsen Hein Fix 3-way-merge of original parent, workdir and new parent.
Thu, 04 Aug 2005 13:31:25 -0800 mpm Merge with BOS
Thu, 04 Aug 2005 13:27:41 -0800 mpm Merge with TAH
Thu, 04 Aug 2005 18:13:17 +0100 Thomas Arendsen Hein Removed special FIXME handling in run-tests, added bug info to .out files.
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.
Sat, 23 Jul 2005 17:14:05 +0100 Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.
less more (0) tip