diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-18 04:21:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-18 04:21:41 +0300 |
commit | aa2d3dbdf56e835e34c8255815019bcfee5066d2 (patch) | |
tree | 4ad0db82f6f37dba7c7e22b57437dc510b70c328 /git-mergetool--lib.sh | |
parent | dadc91ff0c15b655070ad334a27a734e91635bd5 (diff) | |
parent | 0a9dde4a04c1228025d292f44113cb8f9cebbfba (diff) |
Merge branch 'jt/trace2-BUG'
Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
* jt/trace2-BUG:
usage: trace2 BUG() invocations
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions