mergetools / gvimdiff2on commit Merge branch 'kl/pretty-doc-markup-fix' (ca9103d)
   1. "$MERGE_TOOLS_DIR/vimdiff"