log tests/test-merge5.out @ 2145:5bb3cb9e5d13

age author description
Sun, 02 Apr 2006 18:16:06 +0200 Thomas Arendsen Hein Tell the user the real "hg update -C" command, not just "-C" when aborting.
Wed, 29 Mar 2006 10:27:16 -0800 Vadim Gelfer add merge command. means same thing as "update -m".
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick