Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1266:703783bc09c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
author mpm@selenic.com
date Fri, 16 Sep 2005 14:01:03 -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