mergetools / vimdiff3on commit Merge branch 'km/rebase-doc-typofix' (d95f610)
   1. "$MERGE_TOOLS_DIR/vimdiff"