From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 6 Feb 2007 05:26:49 +0000 (-0500)
Subject: Correct compiler warnings in fast-import.
X-Git-Tag: v1.5.0-rc4~14^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10e8d68820db9c7b6412d5a553a93fd200388f30?hp=10e8d68820db9c7b6412d5a553a93fd200388f30

Correct compiler warnings in fast-import.

Junio noticed these warnings/errors in fast-import when compiling
with `-Werror -ansi -pedantic`.  A few changes are to reduce compiler
warnings, while one (in cmd_merge) is a bug fix.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---