mergetools / gvimdiff2on commit git-compat-util: introduce skip_to_optional_arg() (afaef55)
   1. "$MERGE_TOOLS_DIR/vimdiff"