changeset 18631 | e2dc5397bc82 |
parent 18605 | bcf29565d89f |
child 18634 | 4b5d37ca3c11 |
--- a/tests/test-issue672.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-issue672.t Sat Feb 09 15:22:04 2013 -0800 @@ -36,10 +36,10 @@ ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a 1: other deleted -> r 1a: remote created -> g + removing 1 updating: 1 1/2 files (50.00%) - removing 1 + getting 1a updating: 1a 2/2 files (100.00%) - getting 1a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit)