Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.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 source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a