--- a/tests/test-merge-changedelete.t Tue Aug 09 09:15:46 2016 -0700
+++ b/tests/test-merge-changedelete.t Fri Aug 12 06:01:42 2016 -0700
@@ -717,9 +717,9 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 -y
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
@@ -893,9 +893,9 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved?
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
@@ -943,9 +943,9 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :merge3
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
@@ -999,9 +999,9 @@
(status identical)
=== :other -> :prompt ===
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved?
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
(status identical)
@@ -1026,9 +1026,9 @@
(status identical)
=== :local -> :prompt ===
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved?
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
(status identical)
@@ -1043,9 +1043,9 @@
(status identical)
=== :fail -> :prompt ===
- local changed file1 which remote deleted
+ local [working copy] changed file1 which remote [destination] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved?
- remote changed file2 which local deleted
+ remote [destination] changed file2 which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
(status identical)