Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4603:66ed92ed115a
Make fast-forward merges full merges
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 18 Jun 2007 12:38:54 -0700 |
parents | 0912d8df5e19 |
children | ff7253a0d1da |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -504,7 +504,6 @@ def update(repo, node, branchmerge, forc if branchmerge: if p1.branch() != p2.branch(): fastforward = True - branchmerge = False else: raise util.Abort(_("there is nothing to merge, just use " "'hg update' or look at 'hg heads'"))