Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2352:61909dfb316d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various fixes to darcs conversion script 1. removed files were missed 2. hidden files in top directory were not added/removed correctly 3. suppressed spurious warning on adding new files. 4. hg changeset now checked in with original author and date 5. __file__ not supported by pdb.py
author TK Soh <teekaysoh@yahoo.com>
date Mon, 29 May 2006 16:46:31 +0800
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