mergetools / gvimdiff2on commit Merge branch 'jj/doc-markup-gitcli' into maint (c8394bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"