mergetools / vimdiff2on commit Merge branch 'jk/diff-algo-finishing-touches' (825ccfc)
   1. "$MERGE_TOOLS_DIR/vimdiff"