Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 981:4f81068ed8cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jeffpc
author mpm@selenic.com
date Sat, 20 Aug 2005 13:08:07 -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