Merge branch 'jk/warn-add-gitlink'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"