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 /simple-ipc.h | |
| parent | 6320813bc0daf03f087072a498b5aaa8bbba36bd (diff) | |
| download | git-67feccd3ba4566392774b8ed9492d7169031d4bb.tar.gz | |
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 'simple-ipc.h')
0 files changed, 0 insertions, 0 deletions