Show More
| @@ -13,6 +13,9 b' gvimdiff.regkey=Software\\Vim\\GVim' | |||||
| 13 | gvimdiff.regname=path |
|
13 | gvimdiff.regname=path | |
| 14 | gvimdiff.priority=-9 |
|
14 | gvimdiff.priority=-9 | |
| 15 |
|
15 | |||
|
|
16 | vimdiff.args=$local $other $base | |||
|
|
17 | vimdiff.priority=-10 | |||
|
|
18 | ||||
| 16 | merge.checkconflicts=True |
|
19 | merge.checkconflicts=True | |
| 17 | merge.priority=-100 |
|
20 | merge.priority=-100 | |
| 18 |
|
21 | |||
General Comments 0
You need to be logged in to leave comments.
Login now