diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
| commit | 81483fe613de70e17913167876676528cb37cbcd (patch) | |
| tree | 4a17842effaf13fbcc867ec3fc77d7baba7df03a /Documentation | |
| parent | merge-strategies.txt: add coverage of the `ort` merge strategy (diff) | |
| download | tgif-81483fe613de70e17913167876676528cb37cbcd.tar.xz | |
Update error message and code comment
There were two locations in the code that referred to 'merge-recursive'
but which were also applicable to 'merge-ort'. Update them to more
general wording.
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 'Documentation')
0 files changed, 0 insertions, 0 deletions