Mercurial > hg

diff tests/test-merge-types.t @ 27162:4ab69be0ea15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 11:17:18 -0800
parents 296d55def9c4
children 88d5db4b155c
line wrap: on
line diff
--- a/tests/test-merge-types.t	Wed Nov 25 14:25:26 2015 -0800
+++ b/tests/test-merge-types.t	Mon Nov 30 11:17:18 2015 -0800
@@ -172,7 +172,7 @@
   (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
   picked tool ':prompt' for a (binary False symlink True changedelete False)
   no tool found to merge a
-  keep (l)ocal or take (o)ther? l
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg diff --git
   diff --git a/a b/a