mergetools / gvimdiff3on commit Merge branch 'ah/doc-wserrorhighlight' (4c244c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"