]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0dbbbc1) | patch
MinGW: Fix compiler warning in merge-recursive
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 23 May 2009 08:04:51 +0000 (10:04 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:54:45 +0000 (01:54 -0700)
commitb74d779bd90477f6514d0a9be4a75b4c40ed946c
tree722dce7fd155d6ca7120d81386ee0bba9c3d9f39tree | snapshot
parent0dbbbc1e26c9979e34031c09c641893123d18450commit | diff
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>
builtin-merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.