Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2314:e9b5749e4de3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove quotes from patch command. When the gpatch fix for solaris was introduced in 67a0a3852024 the patch command was "". For some strange reason windows 2000 is not happy with those quotes when given in os.popen.
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Thu, 18 May 2006 22:35:41 -0700
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