mergetools / vimdiff2on commit Merge branch 'jj/doc-markup-gitcli' (0b6f39b)
   1. "$MERGE_TOOLS_DIR/vimdiff"