combine-diff: diff-files fix (#2)
authorJunio C Hamano <junkio@cox.net>
Tue, 14 Feb 2006 09:11:42 +0000 (01:11 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 14 Feb 2006 09:11:42 +0000 (01:11 -0800)
commit9ece7169a434d69a942b71dc49f507da37bbdbc3
tree711dce9eb73ca96833041c9887934ad4f3436156
parent713a11fceb662f275b5e1294acc6f38674834941
combine-diff: diff-files fix (#2)

The raw format "git-diff-files -c" to show unmerged state forgot
to initialize the status fields from parents, causing NUL
characters to be emitted.

Signed-off-by: Junio C Hamano <junkio@cox.net>
diff-files.c