Mercurial > hg

view tests/test-conflict.out @ 10438:e6dc44147234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: add any() and all() functions for Python 2.4 compatibility This patch adds these two very useful functions to the mercurial.util module, because they are not present in Python 2.4.
author Steve Losh <steve@stevelosh.com>
date Fri, 12 Feb 2010 19:59:09 -0500
parents b2310903c462
children
line wrap: on
line source

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 update -C' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig