Mercurial > hg

view tests/test-conflict.out @ 1713:03ee100b8c21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.
author Daniel Santa Cruz <byteshack@gmail.com>
date Fri, 10 Feb 2006 16:45:56 -0500
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