facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-01 09:37:56 +03:00
Code Issues Projects Releases Wiki Activity

Fix merge bug, I hope

Browse Source
This commit is contained in:
mpm@selenic.com 2005-05-17 11:40:45 -08:00
parent 6795b63eb7
commit ca952e3eda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hg.py
View File

@ -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)