diff options
author | Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:53 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
commit | 67feccd3ba4566392774b8ed9492d7169031d4bb (patch) | |
tree | 1718ead5cb129e0db5096bf6152342c700b5686a /perl/header_templates/runtime_prefix.template.pl | |
parent | git-rebase.txt: correct out-of-date and misleading text about renames (diff) | |
download | tgif-67feccd3ba4566392774b8ed9492d7169031d4bb.tar.xz |
merge-strategies.txt: add coverage of the `ort` merge strategy
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/header_templates/runtime_prefix.template.pl')
0 files changed, 0 insertions, 0 deletions