--- a/mercurial/commands.py Fri Jun 01 15:19:08 2012 -0700
+++ b/mercurial/commands.py Mon Jun 04 16:59:57 2012 -0500
@@ -2744,7 +2744,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()
--- a/mercurial/templates/gitweb/filediff.tmpl Fri Jun 01 15:19:08 2012 -0700
+++ b/mercurial/templates/gitweb/filediff.tmpl Mon Jun 04 16:59:57 2012 -0500
@@ -26,8 +26,9 @@
<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
diff |
-<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> |
+<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
+<br/>
</div>
<div class="title">{file|escape}</div>