Merge branch 'mk/blame-first-parent'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"