log tests/test-merge7.out @ 2436:f910b91dd912

age author description
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
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".
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.
Mon, 13 Mar 2006 08:56:59 +0100 Benoit Boissinot ui: output the number of file updated/merged/removed/... on update
Tue, 27 Sep 2005 14:53:11 -0700 Matt Mackall Make test-merge7 repeatable
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases