mergetools / gvimdiff2on commit Merge branch 'tz/exclude-doc-smallfixes' (3c5b6ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"