Update error message and code comment
commit81483fe613de70e17913167876676528cb37cbcd
authorElijah Newren <newren@gmail.com>
Wed, 4 Aug 2021 23:50:54 +0000 (4 23:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Aug 2021 15:57:40 +0000 (5 08:57 -0700)
tree4a17842effaf13fbcc867ec3fc77d7baba7df03a
parent67feccd3ba4566392774b8ed9492d7169031d4bb
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>
builtin/merge.c
sequencer.c