changeset 36966 | 66651ec259ea |
parent 36945 | 45bfcd16f27e |
child 36988 | 66e64681e0a8 |
--- a/mercurial/commands.py Wed Mar 07 19:57:50 2018 -0800 +++ b/mercurial/commands.py Mon Mar 05 00:18:07 2018 -0500 @@ -2306,7 +2306,7 @@ finally: repo.ui.setconfig('ui', 'forcemerge', '', 'graft') # report any conflicts - if stats and stats[3] > 0: + if stats[3] > 0: # write out state for --continue nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] repo.vfs.write('graftstate', ''.join(nodelines))