Mercurial > public > mercurial-scm > hg

diff tests/test-copy-move-merge.t @ 27163:27b89a0957ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 13:43:55 -0800
parents 296d55def9c4
children c881367688fe
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Mon Nov 30 11:17:18 2015 -0800
+++ b/tests/test-copy-move-merge.t	Mon Nov 30 13:43:55 2015 -0800
@@ -83,7 +83,7 @@
   $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
   rebasing 2:add3f11052fa "other" (tip)
   remote changed a which local deleted
-  use (c)hanged version or leave (d)eleted? c
+  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
 
   $ cat b
   1