equal
deleted
inserted
replaced
3176 try: |
3176 try: |
3177 # ui.forcemerge is an internal variable, do not document |
3177 # ui.forcemerge is an internal variable, do not document |
3178 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
3178 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
3179 'graft') |
3179 'graft') |
3180 stats = mergemod.update(repo, ctx.node(), True, True, False, |
3180 stats = mergemod.update(repo, ctx.node(), True, True, False, |
3181 ctx.p1().node()) |
3181 ctx.p1().node(), |
|
3182 labels=['local', 'graft']) |
3182 finally: |
3183 finally: |
3183 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
3184 repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
3184 # report any conflicts |
3185 # report any conflicts |
3185 if stats and stats[3] > 0: |
3186 if stats and stats[3] > 0: |
3186 # write out state for --continue |
3187 # write out state for --continue |