Merge branch 'ah/doc-pretty-color-auto-prefix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"