Mercurial > public > mercurial-scm > hg

diff tests/test-merge-remove.t @ 39277:f785073f792c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve interactive one-changed one-deleted message (issue5550) I like the wording from the bug, so I figured I'd package it up in a change and see what people think. Differential Revision: https://phab.mercurial-scm.org/D4336
author Augie Fackler <augie@google.com>
date Mon, 20 Aug 2018 13:29:48 -0400
parents 41ef02ba329b
children 975d959295ef
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-merge-remove.t	Mon Aug 20 13:29:48 2018 -0400
@@ -102,7 +102,8 @@
 Those who use force will lose
 
   $ hg merge -f
-  other [merge rev] changed bar which local [working copy] deleted
+  file bar was deleted in other [merge rev] but was modified in local [working copy].
+  What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging foo1 and foo to foo1
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved