tests/test-conflict.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 27 Aug 2009 14:15:04 +0200
changeset 9427 d37c0f4e8f48
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
parsers.c: parse_manifest: fixing refcount of flags When flags was DECREF'ed, scope was referencing to the outer variable, outside of the block. It was in fact always NULL: the real Python object was never decref'ed.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig