mergetools / gvimdiff3on commit builtin/apply: make check_apply_state() return -1 instead of die()ing (f36538d)
   1. "$MERGE_TOOLS_DIR/vimdiff"