diff tests/test-rename-merge2.t @ 39277:f785073f792c

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

--- a/tests/test-rename-merge2.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-rename-merge2.t	Mon Aug 20 13:29:48 2018 -0400
@@ -692,7 +692,8 @@
   starting 4 threads for background file closing (?)
    a: prompt deleted/changed -> m (premerge)
   picked tool ':prompt' for a (binary False symlink False changedelete True)
-  other [merge rev] changed a which local [working copy] deleted
+  file a 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
    b: both created -> m (premerge)
   picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
@@ -737,7 +738,8 @@
   starting 4 threads for background file closing (?)
    a: prompt changed/deleted -> m (premerge)
   picked tool ':prompt' for a (binary False symlink False changedelete True)
-  local [working copy] changed a which other [merge rev] deleted
+  file a 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
    b: both created -> m (premerge)
   picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)