Mercurial > hg

diff mercurial/ancestor.py @ 13561:0ab0ceefddf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove last traces of fastforward merging bbc97d419b16 introduced fast-forward branch merging. 66ed92ed115a partly removed it again. The fastforward variable would always be false if branchmerge was false, so the fastforward variable makes no difference and we can remove it completely.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 08 Mar 2011 01:21:50 +0100
parents 22565ddb28e7
children 1ffeeb91c55d
line wrap: on
line diff