mergetools / vimdiff2on commit merge-recursive: flush output buffer before printing error messages (bc9204d)
   1. "$MERGE_TOOLS_DIR/vimdiff"