Merge branch 'jk/delete-modechange-conflict' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"