projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c0599f6
e5e9b56
)
Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Apr 2012 19:41:59 +0000
(12:41 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Apr 2012 19:41:59 +0000
(12:41 -0700)
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
1
2
combine-diff.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
combine-diff.c
Simple merge