##// END OF EJS Templates
give worst-case 'merge' merge-tool lowest priority...
David Champion -
r11147:bdc8f048 default
parent child Browse files
Show More
@@ -13,7 +13,7 b' gvimdiff.regname=path'
13 13 gvimdiff.priority=-9
14 14
15 15 merge.checkconflicts=True
16 merge.priority=-10
16 merge.priority=-100
17 17
18 18 gpyfm.gui=True
19 19
General Comments 0
You need to be logged in to leave comments. Login now