Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1365:74cf45f8bc19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suppress warning in zsh_completion script
author Mikael Berthe <mikael@lilotux.net>
date Fri, 30 Sep 2005 11:06:13 -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