mergetools / gvimdiff3on commit Merge branch 'wk/doc-clarify-upstream' (c8704ad)
   1. "$MERGE_TOOLS_DIR/vimdiff"