| commit | 67feccd3ba4566392774b8ed9492d7169031d4bb | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 4 Aug 2021 23:50:53 +0000 (4 23:50 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Aug 2021 15:57:40 +0000 (5 08:57 -0700) | ||
| tree | 1718ead5cb129e0db5096bf6152342c700b5686a | treesnapshot (tar.gz zip) |
| parent | 6320813bc0daf03f087072a498b5aaa8bbba36bd | commitdiff |
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>
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>
| Documentation/merge-strategies.txt | diffblobblamehistory |