mergetools / gvimdiffon commit merge-recursive: improve add_cacheinfo error handling (fd53b7f)
   1. "$MERGE_TOOLS_DIR/vimdiff"