Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert2.out @ 2029:d436b21b20dc
rewrite revert command. fix issues 93, 123, 147.
new version does these things:
- saves backup copies of modified files (issue 147)
- prints output like other commands, and errors when files not found
(issue 123)
- marks files added/removed (issue 93)
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 31 Mar 2006 10:37:25 -0800 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line diff
--- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -3,6 +3,7 @@ 0:9eca13a34789 f248da0d4c3e tip 9eca13a34789 9eca13a34789+ +reverting file1 9eca13a34789 f248da0d4c3e tip merge: warning: conflicts during merge @@ -21,6 +22,7 @@ diff -r f248da0d4c3e file1 +>>>>>>> M file1 f248da0d4c3e+ tip +reverting file1 f248da0d4c3e tip f248da0d4c3e tip f248da0d4c3e tip