mergetools / vimdiff2on commit Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint (bd8e338)
   1. "$MERGE_TOOLS_DIR/vimdiff"