Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1669:91d40fc959f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turn patchbomb script into an extension module. command name is now 'hg email'.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 31 Jan 2006 08:06:35 -0800
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