diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:48 -0700 |
| commit | f33b5bddaf7ac1535c6c37fde168597e252872b3 (patch) | |
| tree | 6235e08655abd8e92b9e895ba84f1db7473bf3db /xdiff/xdiffi.h | |
| parent | Merge branch 'jt/cdn-offload' (diff) | |
| parent | t4014: do not use "slave branch" nomenclature (diff) | |
| download | tgif-f33b5bddaf7ac1535c6c37fde168597e252872b3.tar.xz | |
Merge branch 'pb/t4014-unslave'
A branch name used in a test has been clarified to match what is
going on.
* pb/t4014-unslave:
t4014: do not use "slave branch" nomenclature
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions