changeset 20641 | 3db9e798e004 |
parent 19802 | 94c394653b2a |
child 21389 | e741972017d9 |
--- a/tests/test-up-local-change.t Sun Mar 02 18:36:02 2014 +0100 +++ b/tests/test-up-local-change.t Tue Feb 25 20:29:14 2014 +0100 @@ -176,6 +176,8 @@ [255] $ hg --debug merge -f searching for copies back to rev 1 + unmatched files new in both: + b resolving manifests branchmerge: True, force: True, partial: False ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4