Merge https://github.com/prati0100/git-gui
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"