diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -403,7 +403,7 @@ def merge(repo, node, force=None, remind _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " - "or 'hg update -C' to abandon\n")) + "or 'hg update -C .' to abandon\n")) elif remind: repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats[3] > 0 diff --git a/tests/test-add.t b/tests/test-add.t --- a/tests/test-add.t +++ b/tests/test-add.t @@ -53,7 +53,7 @@ should fail 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 st M a ? a.orig diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t --- a/tests/test-commit-unresolved.t +++ b/tests/test-commit-unresolved.t @@ -31,7 +31,7 @@ Merging a conflict araises warning: conflicts during merge. merging A failed! 1 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 Correct the conflict without marking the file as resolved diff --git a/tests/test-conflict.t b/tests/test-conflict.t --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -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 diff --git a/tests/test-convert-svn-sink.out b/tests/test-convert-svn-sink.out --- a/tests/test-convert-svn-sink.out +++ b/tests/test-convert-svn-sink.out @@ -265,7 +265,7 @@ merging b warning: conflicts during merge. merging b failed! 2 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 assuming destination b-hg initializing svn repository 'b-hg' initializing svn working copy 'b-hg-wc' diff --git a/tests/test-keyword.t b/tests/test-keyword.t --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -817,7 +817,7 @@ conflict: keyword should stay outside co 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 diff --git a/tests/test-log.t b/tests/test-log.t --- a/tests/test-log.t +++ b/tests/test-log.t @@ -898,7 +898,7 @@ log -p -R repo warning: conflicts during merge. merging foo 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 $ echo 'merge 1' > foo $ hg resolve -m foo $ hg ci -m "First merge, related" @@ -908,7 +908,7 @@ log -p -R repo warning: conflicts during merge. merging foo failed! 1 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 $ echo 'merge 2' > foo $ hg resolve -m foo $ hg ci -m "Last merge, related" diff --git a/tests/test-merge-internal-tools-pattern.t b/tests/test-merge-internal-tools-pattern.t --- a/tests/test-merge-internal-tools-pattern.t +++ b/tests/test-merge-internal-tools-pattern.t @@ -42,7 +42,7 @@ Merge using internal:fail tool: $ hg merge 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 f line 1 diff --git a/tests/test-merge-tools.out b/tests/test-merge-tools.out --- a/tests/test-merge-tools.out +++ b/tests/test-merge-tools.out @@ -17,7 +17,7 @@ merging f warning: conflicts during merge. merging f 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 f <<<<<<< local revision 1 @@ -37,7 +37,7 @@ false.whatever= merging f merging f 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 f revision 1 space @@ -69,7 +69,7 @@ true.priority=1 merging f merging f 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 f revision 1 space @@ -86,7 +86,7 @@ true.priority=1 merging f merging f 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 f revision 1 space @@ -103,7 +103,7 @@ true.priority=1 merging f merging f 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 f revision 1 space @@ -120,7 +120,7 @@ true.priority=1 merging f merging f 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 f revision 1 space @@ -185,7 +185,7 @@ true.executable=cat merging f merging f 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 f revision 1 space @@ -204,7 +204,7 @@ couldn't find merge tool true specified merging f merging f 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 f revision 1 space @@ -223,7 +223,7 @@ couldn't find merge tool true specified merging f merging f 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 f revision 1 space @@ -244,7 +244,7 @@ true.executable=cat merging f merging f 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 f revision 1 space @@ -260,7 +260,7 @@ true.executable=cat # hg update -C 1 # hg merge -r 2 --config ui.merge=internal:fail 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 f revision 1 space @@ -323,7 +323,7 @@ true.executable=cat # hg merge -r 2 --config ui.merge=internal:dump merging f 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 f revision 1 space @@ -354,7 +354,7 @@ true.executable=cat merging f merging f 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 f revision 1 space @@ -537,7 +537,7 @@ merging f was merge successful (yn)? n merging f 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 f revision 1 space diff --git a/tests/test-merge7.t b/tests/test-merge7.t --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -47,7 +47,7 @@ now pull and merge from test-a warning: conflicts during merge. merging test.txt 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 resolve conflict $ cat >test.txt <<"EOF" > one @@ -91,7 +91,7 @@ pull and merge from test-a again warning: conflicts during merge. merging test.txt 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 test.txt one diff --git a/tests/test-merge9.t b/tests/test-merge9.t --- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -30,7 +30,7 @@ test with the rename on the remote side merging bar failed! merging foo and baz to baz 1 files updated, 1 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 resolve -l U bar R baz @@ -43,7 +43,7 @@ test with the rename on the local side merging bar failed! merging baz and foo to baz 1 files updated, 1 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 show unresolved $ hg resolve -l diff --git a/tests/test-mq-qnew.out b/tests/test-mq-qnew.out --- a/tests/test-mq-qnew.out +++ b/tests/test-mq-qnew.out @@ -53,7 +53,7 @@ merging a 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 abort: cannot manage merge changesets %%% hg headers adding a @@ -116,5 +116,5 @@ merging a 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 abort: cannot manage merge changesets diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -23,7 +23,7 @@ failing merge $ HGMERGE=internal:fail hg merge 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 $ echo resolved > file $ hg resolve -m file diff --git a/tests/test-status-color.t b/tests/test-status-color.t --- a/tests/test-status-color.t +++ b/tests/test-status-color.t @@ -267,7 +267,7 @@ test unknown color warning: conflicts during merge. merging b failed! 0 files updated, 0 files merged, 0 files removed, 2 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 resolve -m b hg resolve with one unresolved, one resolved: diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -217,7 +217,7 @@ merge tests warning: conflicts during merge. merging t 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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)