Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1214:34706a835d4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Smarter handling of revlog key errors Use RevlogError for reporting exceptions Catch and report RevlogError exceptions at the command parser
author mpm@selenic.com
date Wed, 07 Sep 2005 23:38:28 -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