Mercurial > hg

view tests/test-conflict.out @ 1568:1d7d0c07e8f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make all commands be repo-wide by default - refactor code in commands.py so that: if no pattern is given, the command will be repo-wide else it will work on the working dir - update the doc - fix the tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 01 Dec 2005 10:51:45 -0600
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