| commit | a0bf40ddc94d8ec57c2422b29ba82f3450211300 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:37:55 +0000 (27 14:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:37:56 +0000 (27 14:37 -0700) | ||
| tree | 830f20f92ef7463a1a0b539d36c9afb828237de4 | treesnapshot (tar.gz zip) |
| parent | 81de16a5d5d1efffb472eac9d2a7f373cdcd906b | commitdiff |
| parent | aac385717a62bfa6889151d191e08b9725587912 | commitdiff |
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
* mk/combine-diff-context-horizon-fix:
combine-diff.c: Fix output when changes are exactly 3 lines apart
| combine-diff.c | diff1 | diff2 | blobhistory |
| t/t4038-diff-combined.sh | diff1 | diff2 | blobhistory |