diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
| commit | d1a251a1fa686dc98f7e3160143dfa809ec1a51d (patch) | |
| tree | 21721377ebe5950aded37c52b264d4cfe22106a9 /unpack-trees.h | |
| parent | Merge branch 'sg/diff-indent-heuristic-non-experimental' (diff) | |
| parent | checkout: remove duplicate code (diff) | |
| download | tgif-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.tar.xz | |
Merge branch 'en/checkout-mismerge-fix'
Fix a mismerge that happened in 2.22 timeframe.
* en/checkout-mismerge-fix:
checkout: remove duplicate code
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions