tests/test-resolve.t
changeset 26939 50d2389a2e49
parent 26784 c0aab5961876
child 26969 b54b520a24c2
--- a/tests/test-resolve.t	Thu Nov 12 17:00:08 2015 -0600
+++ b/tests/test-resolve.t	Tue Nov 10 14:26:19 2015 -0800
@@ -197,6 +197,18 @@
   $ cat file2.orig
   foo
   baz
+
+.orig files should exists where specified
+  $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
+  merging file1
+  creating directory: $TESTTMP/repo/.hg/origbackups
+  merging file2
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+  warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
+  [1]
+  $ ls .hg/origbackups
+  file1.orig
+  file2.orig
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null