log tests/test-merge5.out @ 1258:1945754e466b

age author description
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick
Thu, 04 Aug 2005 13:31:25 -0800 mpm Merge with BOS
Thu, 04 Aug 2005 13:27:41 -0800 mpm Merge with TAH
Tue, 02 Aug 2005 08:57:32 -0800 mpm Merge with BOS
Sun, 31 Jul 2005 17:31:15 -0800 Bryan O'Sullivan Update output for test-merge5.
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.
Fri, 22 Jul 2005 19:46:02 -0800 Bryan O'Sullivan Update tests to match new addremove chattiness.
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u
Mon, 04 Jul 2005 12:38:34 -0800 maf46 Fix zombie files in merge
Tue, 21 Jun 2005 19:14:11 -0800 mpm [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted