--- a/tests/test-merge-changedelete.t Fri May 19 20:29:11 2017 -0700
+++ b/tests/test-merge-changedelete.t Tue Jun 06 22:17:39 2017 +0530
@@ -114,6 +114,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
@@ -178,6 +179,7 @@
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
@@ -254,6 +256,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF
@@ -316,6 +319,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :local
@@ -364,6 +368,7 @@
$ hg co -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :other
@@ -412,6 +417,7 @@
$ hg co -C
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :fail
@@ -463,6 +469,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt
@@ -521,6 +528,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :prompt
@@ -577,6 +585,7 @@
$ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default"
$ hg merge --tool :merge3