Mercurial > hg

view tests/test-conflict.out @ 1253:a45e717c61a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add rename/mv command. This is the logical equivalent of copy and remove, and is in fact implemented as such. It doesn't use the remove command directly.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 14 Sep 2005 16:34:22 -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