tests/test-merge-revert.out
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)
Sat, 01 Apr 2006 11:58:50 +0200 Thomas Arendsen Hein Don't abort when backup files already exist. Don't allow alternative names.
Fri, 31 Mar 2006 10:52:56 -0800 Vadim Gelfer forgot to rerun tests after changed backup extension to .orig.
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, 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 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
less more (0) -15 tip