| branch | stable |
| changeset 17422 | 93bc65e970c0 |
| parent 13566 | a87a0fcb412f |
| child 18385 | bafbfe0b450c |
| 17421:3eb85477c0d9 | 17422:93bc65e970c0 |
|---|---|
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 |
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 |
22 merge.priority=-100 |
23 merge.priority=-100 |
23 |
24 |