Mercurial > hg

view tests/test-conflict.out @ 4017:ea6174c96ae1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
catch AttributeError in util.checklink There's no symlink function in the os module on windows. Fixes issue468
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 05 Jan 2007 00:01:51 -0200
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: 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
something else
=======
something
M a