From: Junio C Hamano Date: Mon, 16 Apr 2012 19:41:59 +0000 (-0700) Subject: Merge branch 'rs/combine-diff-zero-context-at-the-beginning' X-Git-Tag: v1.7.11-rc0~150 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f84e8b6069e87230bf4d13f845748c58d599c572?hp=--cc Merge branch 'rs/combine-diff-zero-context-at-the-beginning' Fixes an age old corner case bug in combine diff (only triggered with -U0 and the hunk at the beginning of the file needs to be shown). By René Scharfe * rs/combine-diff-zero-context-at-the-beginning: combine-diff: fix loop index underflow --- f84e8b6069e87230bf4d13f845748c58d599c572