summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-14 09:11:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-14 09:11:42 (GMT)
commit9ece7169a434d69a942b71dc49f507da37bbdbc3 (patch)
tree711dce9eb73ca96833041c9887934ad4f3436156 /Makefile
parent713a11fceb662f275b5e1294acc6f38674834941 (diff)
downloadgit-9ece7169a434d69a942b71dc49f507da37bbdbc3.zip
git-9ece7169a434d69a942b71dc49f507da37bbdbc3.tar.gz
git-9ece7169a434d69a942b71dc49f507da37bbdbc3.tar.bz2
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions