Show More
@@ -2695,7 +2695,7 b' def graft(ui, repo, *revs, **opts):' | |||||
2695 | stats = mergemod.update(repo, ctx.node(), True, True, False, |
|
2695 | stats = mergemod.update(repo, ctx.node(), True, True, False, | |
2696 | ctx.p1().node()) |
|
2696 | ctx.p1().node()) | |
2697 | finally: |
|
2697 | finally: | |
2698 | ui.setconfig('ui', 'forcemerge', '') |
|
2698 | repo.ui.setconfig('ui', 'forcemerge', '') | |
2699 | # drop the second merge parent |
|
2699 | # drop the second merge parent | |
2700 | repo.setparents(current.node(), nullid) |
|
2700 | repo.setparents(current.node(), nullid) | |
2701 | repo.dirstate.write() |
|
2701 | repo.dirstate.write() |
General Comments 0
You need to be logged in to leave comments.
Login now