mergetools / gvimdiff3on commit Merge branch 'dt/api-doc-setup-gently' (520cd9c)
   1. "$MERGE_TOOLS_DIR/vimdiff"