Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: restore config option on correct ui stable
authorIdan Kamara <idankk86@gmail.com>
Mon, 04 Jun 2012 15:43:16 +0300
branchstable
changeset 16850 9c86ef980d9e
parent 16844 a7ba57b10530
child 16864 92cfde8728ac
child 16869 00e1e40d709c
graft: restore config option on correct ui
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Mon Jun 04 18:03:23 2012 +0200
+++ b/mercurial/commands.py	Mon Jun 04 15:43:16 2012 +0300
@@ -2695,7 +2695,7 @@
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
                                             ctx.p1().node())
                 finally:
-                    ui.setconfig('ui', 'forcemerge', '')
+                    repo.ui.setconfig('ui', 'forcemerge', '')
                 # drop the second merge parent
                 repo.setparents(current.node(), nullid)
                 repo.dirstate.write()
Mercurial