Mercurial > hg
comparison mercurial/hook.py @ 13561:0ab0ceefddf2
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 | 1775382ff833 |
| children | 600e64004eb5 |
comparison
equal
deleted
inserted
replaced
| 13560:a2734c8322ac | 13561:0ab0ceefddf2 |
|---|