| commit | 0018da1088e3d7e282998d80db3c719fa7a18ce3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2016 21:45:46 +0000 (6 14:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2016 21:45:46 +0000 (6 14:45 -0700) | ||
| tree | 68f5adf91842c3aabd6db45afaa29e989be885b5 | treesnapshot (tar.gz zip) |
| parent | 21b4ae74b4c6094f5aabcafe4fc01bd2d8cfd054 | commitdiff |
| parent | 77085a616b0fe0eaba99dfe27247ae733f1570e9 | commitdiff |
Merge branch 'jk/diff-compact-heuristic'
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
* jk/diff-compact-heuristic:
diff: undocument the compaction heuristic knobs for experimentation
xdiff: implement empty line chunk heuristic
xdiff: add recs_match helper function
Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.
* jk/diff-compact-heuristic:
diff: undocument the compaction heuristic knobs for experimentation
xdiff: implement empty line chunk heuristic
xdiff: add recs_match helper function
| diff.c | diff1 | diff2 | blobhistory |
| xdiff/xdiff.h | diff1 | diff2 | blobhistory |