Mercurial > hg

view tests/test-conflict.out @ 2108:30c7564f6dfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Apr 2006 15:33:51 -0500
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a