##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergetools.hgrc: add vimdiff...
Martin Geisler -
r11506:48e549d7 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -13,6 +13,9 b' gvimdiff.regkey=Software\\Vim\\GVim'
13 13 gvimdiff.regname=path
14 14 gvimdiff.priority=-9
15 15
16 vimdiff.args=$local $other $base
17 vimdiff.priority=-10
18
16 19 merge.checkconflicts=True
17 20 merge.priority=-100
18 21
General Comments 0
You need to be logged in to leave comments. Login now