changeset 23397 | c7c95838be9a |
parent 23396 | 6a254a2dd37c |
child 23482 | 208ec8ca7c79 |
--- a/tests/test-rename-merge2.t Mon Nov 24 16:16:34 2014 -0800 +++ b/tests/test-rename-merge2.t Mon Nov 24 16:42:36 2014 -0800 @@ -343,7 +343,7 @@ ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 preserving b for resolve of b preserving rev for resolve of rev - b: both created -> m + b: both renamed from a -> m updating: b 1/2 files (50.00%) picked tool 'python ../merge' for b (binary False symlink False) merging b