Mercurial > hg

diff tests/test-bdiff.py @ 16094:0776a6cababe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't use unknown() This removes use of unknown files for building the synthetic working directory manifest used by manifestmerge. Instead, we adopt the strategy used by _checkunknown. Side-effect: unknown files are no longer moved by remote directory renames, and now are left alone like ignored files.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 17:04:17 -0600
parents eeac5e179243
children 2e54aaa65afc
line wrap: on
line diff