log tests/test-merge-revert @ 5479:f7c99e89178f

age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Tue, 26 Dec 2006 14:17:48 +0100 Thomas Arendsen Hein Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Mon, 21 Aug 2006 09:44:52 -0700 Vadim Gelfer revert: require --all to revert all files.
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.
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:59:10 +0100 Thomas Arendsen Hein Allow tests for not yet fixed bugs to fail without generating error diff.
Fri, 29 Jul 2005 15:19:43 +0100 Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
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.