# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2014-07-12 11:07:24
# Node ID 33020e87f8c53454c144dfdf809122b77ce38c01
# Parent  8da01b6e7b49cfd7b13d9c655d943bd31a4f2ae7

mergetools: add --nofork option to gvimdiff.diffargs for extdiff

Without --nofork, temporary files are removed immediately before gvimdiff
starts.  "-d -g -O" are put just for consistency with gvimdiff.args.

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -14,6 +14,7 @@ gvimdiff.regkey=Software\Vim\GVim
 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