merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"