Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4623:66ed92ed115a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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	Mon Jun 18 11:13:16 2007 -0700
+++ b/mercurial/merge.py	Mon Jun 18 12:38:54 2007 -0700
@@ -504,7 +504,6 @@
         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'"))