mergetools / gvimdiff3on commit diff-parseopt: convert -s|--no-patch (e01df7a)
   1. "$MERGE_TOOLS_DIR/vimdiff"