tests/test-conflict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 27 Jan 2006 12:10:35 +0100
changeset 1641 1ef060ae7966
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
bash_completion: be more careful about whitespaces - use awk to parse the output of hg help. - print one completion candidate per line - print the debug commands after regular commands (this eases the shell side of the parsing) - don't print aliases that are simple abbreviations (e.g. up/update, id/identify)

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