# HG changeset patch
# User mpm@selenic.com
# Date 1116358845 28800
# Node ID 58a1a0425c9b81fe29294f1f6eb9caa4cc313e3f
# Parent  b2e3528115da1f6c923a39771bf5946f6ae96260
Fix merge bug, I hope



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -692,7 +692,7 @@ class localrepository:
             f = 1
             for i in l + [n[1]]:
                 if i in m:
-                    if f <= 4:
+                    if f <= 2:
                         self.ui.debug("found new branch changeset %s\n" %
                                           short(p))
                         fetch.append(p)