mergetools / gvimdiff3on commit Makefile: detect errors in running spatch (f5c2bc2)
   1. "$MERGE_TOOLS_DIR/vimdiff"