mergetools / gvimdiff2on commit builtin/apply: make add_conflicted_stages_file() return -1 on error (a902edc)
   1. "$MERGE_TOOLS_DIR/vimdiff"