changeset 21082 | 0d67fccc0d43 |
parent 20945 | 18adc15635a1 |
child 21391 | cb15835456cb |
--- a/tests/test-issue672.t Sun Apr 06 13:39:51 2014 +0200 +++ b/tests/test-issue672.t Mon Apr 07 02:12:28 2014 +0200 @@ -36,6 +36,7 @@ ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a 1: other deleted -> r 1a: remote created -> g + 2: keep -> k removing 1 updating: 1 1/2 files (50.00%) getting 1a