Mercurial > hg-stable

diff tests/test-commit-amend.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 0829ed3b75e1
children fe150586d9bd
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Mon Nov 30 11:17:18 2015 -0800
+++ b/tests/test-commit-amend.t	Mon Nov 30 13:43:55 2015 -0800
@@ -812,7 +812,7 @@
   $ hg ci -m aa
   $ hg merge -q bar
   local changed aa which remote deleted
-  use (c)hanged version or (d)elete? c
+  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 .
   changeset:   33:97a298b0c59f