Mercurial > hg
view tests/test-conflict.out @ 4752:cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sun, 03 Jun 2007 14:40:56 +0100 |
parents | 93a4e72b4f83 |
children | 5af5f0f9d724 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved warning: conflicts during merge. merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< my something else ======= something >>>>>>> other M a