--- a/tests/test-rename-merge2.t Thu Dec 04 23:08:27 2014 -0500
+++ b/tests/test-rename-merge2.t Wed Dec 03 14:03:20 2014 -0800
@@ -88,7 +88,7 @@
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
preserving a for resolve of b
preserving rev for resolve of rev
- a: keep -> k
+ a: remote unchanged -> k
b: remote copied from a -> m
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
@@ -573,7 +573,7 @@
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
preserving b for resolve of b
preserving rev for resolve of rev
- a: keep -> k
+ a: remote unchanged -> k
b: both created -> m
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)