mergetools / gvimdiffon commit builtin/apply: make parse_whitespace_option() return -1 instead of die()ing (aaf6c44)
   1. "$MERGE_TOOLS_DIR/vimdiff"