changeset 2175 | b2ae81a7df29 |
parent 2043 | 968f036f93a4 |
child 2214 | 6c6c0e5595a2 |
--- a/tests/test-confused-revert.out +++ b/tests/test-confused-revert.out @@ -6,7 +6,11 @@ undeleting a forgetting b %%% should show b unknown and a back to normal ? b +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging a +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) %%% should show foo-b foo-b %%% should show a removed and b added