equal
deleted
inserted
replaced
13 gvimdiff.regkey=Software\Vim\GVim |
13 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 |
17 |
18 vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl' |
18 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' |
19 vimdiff.check=changed |
19 vimdiff.check=changed |
20 vimdiff.priority=-10 |
20 vimdiff.priority=-10 |
21 |
21 |
22 merge.check=conflicts |
22 merge.check=conflicts |
23 merge.priority=-100 |
23 merge.priority=-100 |