From: Junio C Hamano Date: Tue, 14 Feb 2006 09:11:42 +0000 (-0800) Subject: combine-diff: diff-files fix (#2) X-Git-Tag: v1.2.1~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ece7169a434d69a942b71dc49f507da37bbdbc3?ds=inline;hp=9ece7169a434d69a942b71dc49f507da37bbdbc3 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 ---