Mercurial > hg

diff mercurial/merge.py @ 14328:3c65cdcf3ba6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: do not allow binary files to abort an entire merge When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.
author Steve Borho <steve@borho.org>
date Fri, 13 May 2011 19:46:36 -0500
parents 5b3383ea67d2
children 15d1db2abfcb
line wrap: on
line diff