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

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.

--- a/tests/test-merge-changedelete.t	Wed Nov 25 14:25:26 2015 -0800
+++ b/tests/test-merge-changedelete.t	Mon Nov 30 11:17:18 2015 -0800
@@ -422,7 +422,7 @@
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? 
   no tool found to merge file3
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   0 files updated, 0 files merged, 0 files removed, 3 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
@@ -474,7 +474,7 @@
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? c
   no tool found to merge file3
-  keep (l)ocal or take (o)ther? l
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
   0 files updated, 3 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ status
@@ -607,7 +607,7 @@
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? 
   no tool found to merge file3
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   --- diff of status ---
   (status identical)
   
@@ -636,7 +636,7 @@
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? 
   no tool found to merge file3
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   --- diff of status ---
   (status identical)
   
@@ -655,7 +655,7 @@
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? 
   no tool found to merge file3
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   --- diff of status ---
   (status identical)