Mercurial > public > mercurial-scm > hg-stable

diff tests/test-commit-amend.t @ 39304: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 2009d84f245a
children 975d959295ef
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-commit-amend.t	Mon Aug 20 13:29:48 2018 -0400
@@ -824,7 +824,8 @@
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
-  local [working copy] changed aa which other [merge rev] deleted
+  file aa 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? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .