Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2041:077a2da7f1de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: completion for commands provided by extensions Make the bash_completion function call _hg_cmd_$cmd to generate completion candidates for $cmd if that function exists. Add basic completion functions for: - mq: - qpop - qpush - qdelete - qsave - qcommit - strip - hbisect: - bisect - patchbomb: - email - gpg: - sign
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 03 Apr 2006 14:56:00 +0200
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