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 Bryan O'Sullivan <bos@serpentine.com>
Thu, 22 Sep 2005 21:42:33 -0700
changeset 1319 5a15df632e6a
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Fix behaviour of commit. It's now a fatal error if the option to --logfile isn't readable. Ditto if both --message and --logfile are specified.

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