changeset 27137 | 25e4b2f000c5 |
parent 23840 | ddc17eaf0f1b |
child 27163 | 27b89a0957ec |
--- a/tests/test-merge-remove.t Wed Nov 25 14:26:46 2015 -0800 +++ b/tests/test-merge-remove.t Wed Nov 25 14:25:33 2015 -0800 @@ -105,7 +105,7 @@ remote changed bar which local deleted use (c)hanged version or leave (d)eleted? c merging foo1 and foo to foo1 - 1 files updated, 1 files merged, 0 files removed, 0 files unresolved + 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cat bar bleh