mergetools / gvimdiffon commit Merge branch 'tz/notes-error-to-stderr' into maint (0cfcb16)
   1. "$MERGE_TOOLS_DIR/vimdiff"