log tests/test-up-local-change.out @ 2065:2ff37e3bf780

age author description
Fri, 14 Apr 2006 00:41:50 +0200 Benoit Boissinot fix update when a locally added file match the target revision
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".