contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"