diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-23 12:10:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-23 12:10:06 -0700 |
| commit | efc5e5ef8e467ebbdd4f93c23f2269b907fcdc15 (patch) | |
| tree | 2e30481c590aa53020d8b6fe49c52729a0c803d7 /Documentation/technical/trivial-merge.txt | |
| parent | git-log(1): remove --full-line-diff description (diff) | |
| parent | line-log: fix "log -LN" crash when N is last line of file (diff) | |
| download | tgif-efc5e5ef8e467ebbdd4f93c23f2269b907fcdc15.tar.xz | |
Merge branch 'es/line-log-further-fixes' into tr/line-log
* es/line-log-further-fixes:
line-log: fix "log -LN" crash when N is last line of file
range-set: satisfy non-empty ranges invariant
t4211: demonstrate crash when first -L encountered is empty range
t4211: demonstrate empty -L range crash
range-set: fix sort_and_merge_range_set() corner case bug
range_set: fix coalescing bug when range is a subset of another
t4211: fix broken test when one -L range is subset of another
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions