--- a/tests/test-merge-changedelete.t Wed Feb 03 04:37:04 2016 +0000
+++ b/tests/test-merge-changedelete.t Tue Feb 02 14:49:02 2016 +0000
@@ -111,6 +111,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> c
@@ -171,6 +172,7 @@
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> foo
@@ -243,6 +245,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
> d
@@ -301,6 +304,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --tool :local
0 files updated, 3 files merged, 0 files removed, 0 files unresolved
@@ -345,6 +349,7 @@
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --tool :other
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
@@ -389,6 +394,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --tool :fail
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
@@ -436,6 +442,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt
local changed file1 which remote deleted
@@ -491,6 +498,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --tool :prompt
local changed file1 which remote deleted
@@ -544,6 +552,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 1 other heads for branch "default"
$ hg merge --tool :merge3
local changed file1 which remote deleted