Show More
| @@ -14,6 +14,7 b' gvimdiff.regkey=Software\\Vim\\GVim' | |||||
| 14 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim |
|
14 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim | |
| 15 | gvimdiff.regname=path |
|
15 | gvimdiff.regname=path | |
| 16 | gvimdiff.priority=-9 |
|
16 | gvimdiff.priority=-9 | |
|
|
17 | gvimdiff.diffargs=--nofork -d -g -O $parent $child | |||
| 17 |
|
18 | |||
| 18 | vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' |
|
19 | vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' | |
| 19 | vimdiff.check=changed |
|
20 | vimdiff.check=changed | |
General Comments 0
You need to be logged in to leave comments.
Login now