Mercurial > hg-stable
changeset 21875:33020e87f8c5
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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 12 Jul 2014 20:07:24 +0900 |
| parents | 8da01b6e7b49 |
| children | dbbae63865a6 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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