Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"