Mercurial > hg

diff tests/test-conflict.t @ 12314:f2daa6ab514a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Brodie Rao <brodie@bitheap.org>
date Sun, 12 Sep 2010 18:05:53 -0500
parents 4c94b6d0fb1c
children 4134686b83e1
line wrap: on
line diff
--- a/tests/test-conflict.t	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-conflict.t	Sun Sep 12 18:05:53 2010 -0500
@@ -15,7 +15,7 @@
   warning: conflicts during merge.
   merging a 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
 
   $ hg id
   32e80765d7fe+75234512624c+ tip