diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-21 14:55:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-21 14:55:02 -0800 |
| commit | 3c9979be9be8e0fa309e51df8cc2cacb94a23abf (patch) | |
| tree | 8a3dc8f4d7e62e2146dad4ea6b4fce9784800f98 /git-gui/lib/merge.tcl | |
| parent | Merge branch 'sb/sequencer-abort-safety' (diff) | |
| parent | shallow.c: remove useless code (diff) | |
| download | tgif-3c9979be9be8e0fa309e51df8cc2cacb94a23abf.tar.xz | |
Merge branch 'nd/shallow-fixup'
Code cleanup in shallow boundary computation.
* nd/shallow-fixup:
shallow.c: remove useless code
shallow.c: bit manipulation tweaks
shallow.c: avoid theoretical pointer wrap-around
shallow.c: make paint_alloc slightly more robust
shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
shallow.c: rename fields in paint_info to better express their purposes
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions