Merge branch 'jk/alias-in-bare'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"