Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-confused-revert.out @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | b2ae81a7df29 |
children | 6c6c0e5595a2 |
line wrap: on
line diff
--- 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