Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 15 Feb 2006 14:22:16 +0100
changeset 1723 fde8fb2cbede
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Fix diff against an empty file (issue124) and add a test for this.

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a
mercurial-crew-with-dirclash