Merge branch 'mk/combine-diff-context-horizon-fix' into maint
* mk/combine-diff-context-horizon-fix: combine-diff.c: Fix output when changes are exactly 3 lines apart
Junio C Hamano committed
Jun 27, 2013 at 14:37 UTC
a0bf40ddc94d8ec57c2422b29ba82f3450211300
No changes.