mergetools / gvimdiff3on commit Merge branch 'oa/doc-diff-check' into maint (2bbaad8)
   1. "$MERGE_TOOLS_DIR/vimdiff"