diff-merges: let new options enable diff without -p
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"