--- a/contrib/mergetools.hgrc	Sat Jul 05 16:32:28 2014 +0300
+++ b/contrib/mergetools.hgrc	Sat Jul 12 20:07:24 2014 +0900
@@ -14,6 +14,7 @@
 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
 gvimdiff.regname=path
 gvimdiff.priority=-9
+gvimdiff.diffargs=--nofork -d -g -O $parent $child
 
 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
 vimdiff.check=changed