Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1319:5a15df632e6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 22 Sep 2005 21:42:33 -0700
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