mergetools / gvimdiff2on commit transport-helper: report errors properly (81d340d)
   1. "$MERGE_TOOLS_DIR/vimdiff"