mergetools / vimdiff2on commit Merge branch 'jk/push-deadlock-regression-fix' into maint (f4d3af1)
   1. "$MERGE_TOOLS_DIR/vimdiff"