diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-21 15:25:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 15:25:39 -0800 |
| commit | d30146ac5f92fd5e60bdc106dfe01a69b3d45d27 (patch) | |
| tree | f2798dea90b59e6d3db743b5717f504e9110f7ba /git-merge-one-file.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | diff-highlight: document some non-optimal cases (diff) | |
| download | tgif-d30146ac5f92fd5e60bdc106dfe01a69b3d45d27.tar.xz | |
Merge branch 'jk/diff-highlight'
* jk/diff-highlight:
diff-highlight: document some non-optimal cases
diff-highlight: match multi-line hunks
diff-highlight: refactor to prepare for multi-line hunks
diff-highlight: don't highlight whole lines
diff-highlight: make perl strict and warnings fatal
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions