mergetools / gvimdiff2on commit apply: refactor `git apply` option parsing (7e1bad2)
   1. "$MERGE_TOOLS_DIR/vimdiff"