Merge branch 'mp/t7060-diff-index-test'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"