log tests/test-merge-revert.out @ 1781:284fc722c342

age author description
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
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.