merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
[ original upstream message ]
--- a/tests/test-keyword.t Fri Sep 10 21:22:11 2010 +0200
+++ b/tests/test-keyword.t Sun Sep 12 18:05:53 2010 -0500
@@ -817,7 +817,7 @@
warning: conflicts during merge.
merging m failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
$ cat m
$Id$
<<<<<<< local