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.
mergetools: add --nofork option to gvimdiff.diffargs for extdiff
authorYuya Nishihara <yuya@tcha.org>
Sat, 12 Jul 2014 20:07:24 +0900
changeset 21875 33020e87f8c5
parent 21874 8da01b6e7b49
child 21877 dbbae63865a6
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.
contrib/mergetools.hgrc file | annotate | diff | comparison | revisions 
--- 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
Mercurial