Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1148:fad2d091c74f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test-grep.out file for now.
author bos@serpentine.internal.keyresearch.com
date Mon, 29 Aug 2005 11:28:48 -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