simplemerge: move conflict warning message to filemerge

The current output for a failed merge with conflict markers looks something like:

  merging foo
  warning: conflicts during merge.
  merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
  merging bar
  warning: conflicts during merge.
  merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')

We're going to change the way merges are done to perform all premerges before
all merges, so that the output above would look like:

  merging foo
  merging bar
  warning: conflicts during merge.
  merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
  warning: conflicts during merge.
  merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')

The 'warning: conflicts during merge' line has no context, so is pretty
confusing.

This patch will change the future output to:

  merging foo
  merging bar
  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')

The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
that is tricky because we already hint that people run 'hg resolve' to retry
unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
based resolution.

mercurial/filemerge.py

@@ -255,8 +255,8 b' def _merge(repo, mynode, orig, fcd, fco,'
     return True, r
 
 @internaltool('union', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
@@ -267,8 +267,8 b' def _iunion(repo, mynode, orig, fcd, fco'
                   files, labels, 'union')
 
 @internaltool('merge', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
@@ -280,8 +280,8 b' def _imerge(repo, mynode, orig, fcd, fco'
                   files, labels, 'merge')
 
 @internaltool('merge3', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """

mercurial/simplemerge.py

@@ -414,6 +414,4 b' def simplemerge(ui, local, base, other, '
         out.close()
 
     if m3.conflicts and not mode == 'union':
-        if not opts.get('quiet'):
-            ui.warn(_("warning: conflicts during merge.\n"))
         return 1

tests/test-add.t

@@ -97,8 +97,7 b' should fail'
 
   $ hg merge
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-bookmarks-rebase.t

@@ -79,8 +79,7 b' aborted rebase should restore active boo'
   $ hg rebase -s three -d two
   rebasing 4:dd7c838e8362 "4" (tip three)
   merging d
-  warning: conflicts during merge.
-  merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg rebase --abort
@@ -95,8 +94,7 b' after aborted rebase, restoring a bookma'
   $ hg rebase -s three -d two
   rebasing 4:dd7c838e8362 "4" (tip three)
   merging d
-  warning: conflicts during merge.
-  merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg bookmark -d three

tests/test-commit-amend.t

@@ -627,8 +627,7 b' Amend a merge changeset (with renames an'
   $ hg add cc
   $ hg ci -m aa
   $ hg merge -q bar
-  warning: conflicts during merge.
-  merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
   (no more unresolved files)

tests/test-commit-unresolved.t

@@ -25,8 +25,7 b' Merging a conflict araises'
 
   $ hg merge
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-conflict.t

@@ -36,8 +36,7 b''
 
   $ hg merge 1
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -73,8 +72,7 b' Verify custom conflict markers'
 
   $ hg merge 1
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -105,8 +103,7 b' Verify line splitting of custom conflict'
   > EOF
 
   $ hg -q merge 1
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
 
   $ cat a
@@ -148,8 +145,7 b' Verify line trimming of custom conflict '
   > EOF
 
   $ hg -q --encoding utf-8 merge 1
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
 
   $ cat a
@@ -176,8 +172,7 b' Verify basic conflict markers'
 
   $ hg merge 1
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -205,8 +200,7 b' internal:merge3'
 
   $ hg merge 1 --tool internal:merge3
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -251,8 +245,7 b' Now test :merge-other and :merge-local'
 
   $ hg merge
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-contrib.t

@@ -153,7 +153,6 b' conflicts'
   other
   end
   >>>>>>> conflict-other
-  warning: conflicts during merge.
   [1]
 
 1 label
@@ -167,7 +166,6 b' 1 label'
   other
   end
   >>>>>>> conflict-other
-  warning: conflicts during merge.
   [1]
 
 2 labels
@@ -181,7 +179,6 b' 2 labels'
   other
   end
   >>>>>>> bar
-  warning: conflicts during merge.
   [1]
 
 3 labels
@@ -196,7 +193,6 b' 3 labels'
   other
   end
   >>>>>>> bar
-  warning: conflicts during merge.
   [1]
 
 too many labels

tests/test-convert-svn-sink.t

@@ -382,8 +382,7 b' Branchy history'
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg --cwd b merge
   merging b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-fileset.t

@@ -162,9 +162,8 b' Test merge states'
   $ fileset 'unresolved()'
   $ hg merge
   merging b2
-  warning: conflicts during merge.
-  merging b2 incomplete! (edit conflicts, then use 'hg resolve --mark')
-  * files updated, 0 files merged, * files removed, 1 files unresolved (glob)
+  warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
+  6 files updated, 0 files merged, 1 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ fileset 'resolved()'

tests/test-graft.t

@@ -189,8 +189,7 b' Graft out of order, skipping a merge and'
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
   picked tool ':merge' for e (binary False symlink False)
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
@@ -222,8 +221,7 b' Graft again:'
   skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
   grafting 4:9c233e8e184d "4"
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
@@ -423,8 +421,7 b' Resolve conflicted graft'
   [255]
   $ hg resolve --all
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ cat a
   <<<<<<< local: aaa4406d4f0a - test: 9
@@ -749,8 +746,7 b' graft --continue after --force'
   [255]
   $ hg resolve --all
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ echo abc > a
   $ hg resolve -m a

tests/test-histedit-fold-non-commute.t

@@ -88,8 +88,7 b' edit the history'
   $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 fix up
@@ -123,8 +122,7 b' fix up'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 just continue this time
@@ -253,8 +251,7 b' edit the history'
   $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 fix up
@@ -266,8 +263,7 b' fix up'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 just continue this time

tests/test-histedit-fold.t

@@ -296,8 +296,7 b' folded content is dropped during a merge'
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging file
-  warning: conflicts during merge.
-  merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
   [1]
 There were conflicts, we keep P1 content. This
@@ -358,8 +357,7 b' dropped revision.'
   > EOF
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging file
-  warning: conflicts during merge.
-  merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
   [1]
   $ cat > file << EOF

tests/test-histedit-non-commute-abort.t

@@ -72,8 +72,7 b' edit the history'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 

tests/test-histedit-non-commute.t

@@ -89,8 +89,7 b' edit the history'
   $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 abort the edit
@@ -147,8 +146,7 b' edit the history'
   $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 fix up
@@ -158,8 +156,7 b' fix up'
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative
@@ -236,8 +233,7 b' edit the history, this time with a fold '
   $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 
   $ echo 'I can haz no commute' > e
@@ -246,8 +242,7 b' edit the history, this time with a fold '
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
-  warning: conflicts during merge.
-  merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
 second edit also fails, but just continue
   $ hg revert -r 'p1()' e

tests/test-issue1175.t

@@ -70,8 +70,7 b' http://bz.selenic.com/show_bug.cgi?id=44'
   $ hg graft 1
   grafting 1:5974126fad84 "b1"
   merging b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]

tests/test-keyword.t

@@ -1070,8 +1070,7 b' conflict: keyword should stay outside co'
   created new head
   $ hg merge
   merging m
-  warning: conflicts during merge.
-  merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging m! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-largefiles-update.t

@@ -127,8 +127,7 b' Test that "hg merge" updates largefiles '
   keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
   take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
   merging normal1
-  warning: conflicts during merge.
-  merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
   getting changed largefiles
   1 largefiles updated, 0 removed
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
@@ -555,8 +554,7 b' it is aborted by conflict.'
   keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
   take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
   merging normal1
-  warning: conflicts during merge.
-  merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ cat .hglf/large1

tests/test-lfconvert.t

@@ -125,7 +125,7 b' add some changesets to rename/remove/mer'
   $ hg merge
   merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
   warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
-  merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
   merging sub/normal2 and stuff/normal2 to stuff/normal2
   0 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

tests/test-log.t

@@ -1273,8 +1273,7 b' log -p -R repo'
   created new head
   $ hg merge 7
   merging foo
-  warning: conflicts during merge.
-  merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -1285,8 +1284,7 b' log -p -R repo'
 
   $ hg merge 4
   merging foo
-  warning: conflicts during merge.
-  merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-merge-force.t

@@ -192,38 +192,28 b' Merge with remote'
   remote changed content1_content2_missing_missing-untracked which local deleted
   use (c)hanged version or leave (d)eleted? c
   merging content1_content2_content1_content4-tracked
-  warning: conflicts during merge.
-  merging content1_content2_content1_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
   merging content1_content2_content2_content1-tracked
   merging content1_content2_content2_content4-tracked
-  warning: conflicts during merge.
-  merging content1_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
   merging content1_content2_content3_content1-tracked
   merging content1_content2_content3_content3-tracked
-  warning: conflicts during merge.
-  merging content1_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
   merging content1_content2_content3_content4-tracked
-  warning: conflicts during merge.
-  merging content1_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
   merging content1_content2_missing_content1-tracked
   merging content1_content2_missing_content4-tracked
-  warning: conflicts during merge.
-  merging content1_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
   merging missing_content2_content2_content4-tracked
-  warning: conflicts during merge.
-  merging missing_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
   merging missing_content2_content3_content3-tracked
-  warning: conflicts during merge.
-  merging missing_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
   merging missing_content2_content3_content4-tracked
-  warning: conflicts during merge.
-  merging missing_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
   merging missing_content2_missing_content4-tracked
-  warning: conflicts during merge.
-  merging missing_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
   merging missing_content2_missing_content4-untracked
-  warning: conflicts during merge.
-  merging missing_content2_missing_content4-untracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
   39 files updated, 3 files merged, 8 files removed, 10 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]

tests/test-merge-local.t

@@ -62,8 +62,7 b' Local merge with bad merge tool:'
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
-  warning: conflicts during merge.
-  merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
@@ -87,8 +86,7 b' Local merge with conflicts:'
   $ hg co
   merging zzz1_merge_ok
   merging zzz2_merge_bad
-  warning: conflicts during merge.
-  merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   3 files updated, 1 files merged, 2 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
@@ -96,8 +94,7 b' Local merge with conflicts:'
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
-  warning: conflicts during merge.
-  merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
   2 files updated, 1 files merged, 3 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]

tests/test-merge-revert2.t

@@ -44,8 +44,7 b''
 
   $ hg update
   merging file1
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]

tests/test-merge-tools.t

@@ -67,8 +67,7 b' running from a devel copy, not a temp in'
 
   $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -113,8 +112,7 b" unexecutable file in $PATH shouldn't be "
   $ hg up -qC 1
   $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -128,8 +126,7 b" executable directory in $PATH shouldn't "
   $ hg up -qC 1
   $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -1024,7 +1021,7 b' internal merge cannot handle symlinks an'
   $ hg merge -r 2 --tool internal:merge
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-merge-types.t

@@ -40,7 +40,7 b' Symlink is local parent, executable is o'
   merging a
   my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
   warning: internal :merge cannot merge symlinks for a
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -73,7 +73,7 b' Symlink is other parent, executable is l'
   merging a
   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
   warning: internal :union cannot merge symlinks for a
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -96,7 +96,7 b' Symlink is other parent, executable is l'
   merging a
   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
   warning: internal :merge3 cannot merge symlinks for a
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -159,7 +159,7 b' where that was what happened.'
   $ hg merge
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -171,7 +171,7 b' where that was what happened.'
   $ hg merge
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -198,7 +198,7 b" Test removed 'x' flag merged with change"
   $ hg merge
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -210,7 +210,7 b" Test removed 'x' flag merged with change"
   $ hg merge
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -283,22 +283,20 b' h: l vs l, different'
 
   $ hg merge
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   warning: cannot merge flags for b
   merging b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   warning: cannot merge flags for c
   merging d
   warning: internal :merge cannot merge symlinks for d
-  merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   merging h
   warning: internal :merge cannot merge symlinks for h
-  merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
@@ -344,22 +342,20 b' h: l vs l, different'
   $ hg up -Cqr1
   $ hg merge
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   warning: cannot merge flags for b
   merging b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   warning: cannot merge flags for c
   merging d
   warning: internal :merge cannot merge symlinks for d
-  merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   merging f
   warning: internal :merge cannot merge symlinks for f
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   merging h
   warning: internal :merge cannot merge symlinks for h
-  merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]

tests/test-merge7.t

@@ -44,8 +44,7 b' now pull and merge from test-a'
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   merging test.txt
-  warning: conflicts during merge.
-  merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -91,8 +90,7 b' pull and merge from test-a again'
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   picked tool ':merge' for test.txt (binary False symlink False)
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
-  warning: conflicts during merge.
-  merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-merge9.t

@@ -83,8 +83,7 b' resolve all warning'
 resolve all
   $ hg resolve -a
   merging bar
-  warning: conflicts during merge.
-  merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
   [1]
 
 after

tests/test-mq-qnew.t

@@ -156,8 +156,7 b' plain headers'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   (no more unresolved files)
@@ -234,8 +233,7 b' hg headers'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   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
   (no more unresolved files)

tests/test-rebase-abort.t

@@ -64,8 +64,7 b' Conflicting rebase:'
   rebasing 3:3163e20567cc "L1"
   rebasing 4:46f0b057b5c0 "L2" (tip)
   merging common
-  warning: conflicts during merge.
-  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -94,8 +93,7 b' earlier than 2.7 by renaming ".hg/rebase'
   rebasing 3:3163e20567cc "L1"
   rebasing 4:46f0b057b5c0 "L2" (tip)
   merging common
-  warning: conflicts during merge.
-  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -165,8 +163,7 b' Rebase and abort without generating new '
   note: rebase of 3:a6484957d6b9 created no changes to commit
   rebasing 4:145842775fec "C1" (tip)
   merging c
-  warning: conflicts during merge.
-  merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -225,8 +222,7 b' rebase abort should not leave working co'
   $ hg rebase -d master -r foo
   rebasing 3:6c0f977a22d8 "C" (tip foo)
   merging c
-  warning: conflicts during merge.
-  merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg rebase --abort

tests/test-rebase-bookmarks.t

@@ -170,8 +170,7 b' rebase --continue with bookmarks present'
   $ hg rebase
   rebasing 3:3d5fa227f4b5 "C" (Y Z)
   merging c
-  warning: conflicts during merge.
-  merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ echo 'c' > c

tests/test-rebase-check-restore.t

@@ -68,8 +68,7 b' Rebasing B onto E - check keep: and phas'
   rebasing 1:27547f69f254 "B"
   rebasing 2:965c486023db "C"
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -125,8 +124,7 b' Rebase F onto E - check keepbranches:'
   $ hg rebase -s 5 -d 4 --keepbranches
   rebasing 5:01e6ebbd8272 "F" (tip)
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 

tests/test-rebase-conflicts.t

@@ -64,8 +64,7 b' Conflicting rebase:'
   rebasing 3:3163e20567cc "L1"
   rebasing 4:46f0b057b5c0 "L2"
   merging common
-  warning: conflicts during merge.
-  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 

tests/test-rebase-detach.t

@@ -391,8 +391,7 b' Ensure --continue restores a correct sta'
   $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail
   rebasing 8:6215fafa5447 "H2" (tip)
   merging H
-  warning: conflicts during merge.
-  merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging H! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg resolve --all -t internal:local

tests/test-rebase-interruptions.t

@@ -60,8 +60,7 b' Rebasing B onto E:'
   rebasing 1:27547f69f254 "B"
   rebasing 2:965c486023db "C"
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -98,8 +97,7 b' Resume the rebasing:'
   already rebased 1:27547f69f254 "B" as 45396c49d53b
   rebasing 2:965c486023db "C"
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -157,8 +155,7 b' Rebasing B onto E:'
   rebasing 1:27547f69f254 "B"
   rebasing 2:965c486023db "C"
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -230,8 +227,7 b' Rebasing B onto E:'
   rebasing 1:27547f69f254 "B"
   rebasing 2:965c486023db "C"
   merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 

tests/test-rebase-mq.t

@@ -61,8 +61,7 b' Rebase - generate a conflict:'
   $ hg rebase -s 2 -d 1
   rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -75,8 +74,7 b' Fix the 1st conflict:'
   rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
   rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 

tests/test-rename-dir-merge.t

@@ -131,8 +131,7 b' and committed in local target directory.'
   $ hg commit -qm 'new file in target directory'
   $ hg merge 2
   merging b/c and a/c to b/c
-  warning: conflicts during merge.
-  merging b/c incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')
   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
   [1]
@@ -162,8 +161,7 b' and committed in local source directory.'
   C a/c
   $ hg merge 5
   merging a/c and b/c to b/c
-  warning: conflicts during merge.
-  merging b/c incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')
   2 files updated, 0 files merged, 2 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]

tests/test-resolve.t

@@ -134,10 +134,8 b' resolve without arguments should suggest'
 
 resolve --all should re-merge all unresolved files
   $ hg resolve -q --all
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
-  warning: conflicts during merge.
-  merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+  warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null
@@ -145,8 +143,7 b' resolve --all should re-merge all unreso'
 resolve <file> should re-merge file
   $ echo resolved > file1
   $ hg resolve -q file1
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null
 

tests/test-shelve.t

@@ -301,8 +301,7 b' force a conflicted merge to occur'
   rebasing shelved changes
   rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
   merging a/a
-  warning: conflicts during merge.
-  merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
   [1]
 
@@ -382,8 +381,7 b' try to continue with no unshelve underwa'
 redo the unshelve to get a conflict
 
   $ hg unshelve -q
-  warning: conflicts during merge.
-  merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
   [1]
 
@@ -707,8 +705,7 b' unshelve and conflicts with tracked and '
   rebasing shelved changes
   rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
   [1]
   $ hg log -G --template '{rev}  {desc|firstline}  {author}  {date|isodate}'
@@ -763,8 +760,7 b' unshelve and conflicts with tracked and '
   rebasing shelved changes
   rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
   merging f
-  warning: conflicts during merge.
-  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
   [1]
   $ hg st
@@ -807,8 +803,7 b' Recreate some conflict again'
   rebasing shelved changes
   rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
   merging a/a
-  warning: conflicts during merge.
-  merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
   [1]
   $ hg bookmark

tests/test-status-color.t

@@ -325,11 +325,9 b" test 'resolve -l'"
   created new head
   $ hg merge
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   merging b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   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
   [1]

tests/test-subrepo.t

@@ -302,8 +302,7 b' merge tests'
   my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
   picked tool ':merge' for t (binary False symlink False)
   my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
-  warning: conflicts during merge.
-  merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
   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
     subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg

tests/test-update-renames.t

@@ -20,8 +20,7 b' Update with local changes across a file '
 
   $ hg up
   merging a and b to b
-  warning: conflicts during merge.
-  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]