diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 11:16:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 11:16:04 -0800 |
| commit | 17069c7fae20f5e3082ee639066a37de5af6030e (patch) | |
| tree | 52b612da693386eae08a4d87540c15744d468b13 /Documentation/git-merge.txt | |
| parent | First batch after 2.20.1 (diff) | |
| parent | pack-protocol.txt: accept error packets in any context (diff) | |
| download | tgif-17069c7fae20f5e3082ee639066a37de5af6030e.tar.xz | |
Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband
* ms/packet-err-check:
pack-protocol.txt: accept error packets in any context
Use packet_reader instead of packet_read_line
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions