mergetools / vimdiff2on commit builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing (f95fdc2)
   1. "$MERGE_TOOLS_DIR/vimdiff"