From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 23 May 2009 08:04:51 +0000 (+0200)
Subject: MinGW: Fix compiler warning in merge-recursive
X-Git-Tag: v1.6.4-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b74d779bd90477f6514d0a9be4a75b4c40ed946c?hp=b74d779bd90477f6514d0a9be4a75b4c40ed946c

MinGW: Fix compiler warning in merge-recursive

GCC 4.4.0 on Windows does not like the format %zu.  It is quite unlikely,
though, that we need more merge bases than a %d can display, so replace
the %zu by a %d.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---