Mercurial > hg

diff tests/test-sparse-merges.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 d49e490a9e85
children 975d959295ef
line wrap: on
line diff
--- a/tests/test-sparse-merges.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-sparse-merges.t	Mon Aug 20 13:29:48 2018 -0400
@@ -113,7 +113,8 @@
 
   $ hg merge
   temporarily included 1 file(s) in the sparse checkout for merging
-  local [working copy] changed d which other [merge rev] deleted
+  file d was deleted in local [working copy] but was modified in other [merge rev].
+  What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon