Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1639:dbfc04a55607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Jan 2006 15:07:46 +0100
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a