Show More
@@ -16,6 +16,7 b' gvimdiff.regname=path' | |||||
16 | gvimdiff.priority=-9 |
|
16 | gvimdiff.priority=-9 | |
17 |
|
17 | |||
18 | vimdiff.args=$local $other $base |
|
18 | vimdiff.args=$local $other $base | |
|
19 | vimdiff.check=changed | |||
19 | vimdiff.priority=-10 |
|
20 | vimdiff.priority=-10 | |
20 |
|
21 | |||
21 | merge.checkconflicts=True |
|
22 | merge.checkconflicts=True |
General Comments 0
You need to be logged in to leave comments.
Login now