log tests/test-merge6.out @ 5483:0c43f87baba3 default tip

age author description
Sat, 06 Oct 2007 22:30:22 +0200 Patrick Mezard Display symlink or executable bit with manifest -v
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)
Wed, 29 Mar 2006 10:27:16 -0800 Vadim Gelfer add merge command. means same thing as "update -m".
Wed, 24 Aug 2005 19:19:35 -0700 mpm Update tests
Tue, 23 Aug 2005 02:19:38 -0700 mpm Clean up some merge logic
Sun, 21 Aug 2005 21:59:55 -0700 mpm Fix long-standing excessive file merges
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick