diff tests/test-update-branches.t @ 31175:7433b3bc55ee

update: for "noconflict" updates, print "conflicting changes" on conflict

With experimental.updatecheck=noconflict, if the update is aborted
because of conlicts, "uncommitted changes" is not quite
accurate. Let's use "conflicting changes" instead. Also fix the hint
to recomment --clean, not --merge, since that's what we do for other
failed updates.

--- a/tests/test-update-branches.t	Mon Mar 06 23:19:57 2017 -0800
+++ b/tests/test-update-branches.t	Mon Mar 06 23:21:27 2017 -0800
@@ -295,8 +295,8 @@
   $ hg up -qC 3
   $ echo dirty >> a
   $ hg up -q 4
-  abort: uncommitted changes
-  (commit or update --merge to allow merge)
+  abort: conflicting changes
+  (commit or update --clean to discard changes)
   [255]
   $ hg up -m 4
   merging a