--- a/tests/test-merge-prompt.t Mon Feb 04 02:46:38 2013 +0100
+++ b/tests/test-merge-prompt.t Mon Feb 04 02:46:53 2013 +0100
@@ -42,7 +42,7 @@
Non-interactive merge:
$ hg merge -y
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
@@ -70,7 +70,7 @@
> c
> d
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -97,11 +97,11 @@
> baz
> c
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
@@ -126,7 +126,7 @@
$ hg merge --config ui.interactive=true <<EOF
> d
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
[255]