mergetools / gvimdiff2on commit format-patch: do not let its diff-options affect --range-diff (d8981c3)
   1. "$MERGE_TOOLS_DIR/vimdiff"