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>
Sun, 12 Mar 2006 20:34:09 +0100
changeset 1921 acce3f7e1779
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Don't expand empty [paths] so later interpolation can do the right thing. Example: [paths] default = default-push = %(default)s

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