mergetools / gvimdiff2on commit Merge branch 'jk/diff-algo' into maint (b28325d)
   1. "$MERGE_TOOLS_DIR/vimdiff"