diff options
| author | Jeff King <peff@peff.net> | 2023-09-14 05:39:53 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 12:01:29 -0700 |
| commit | 1c9419ae9d262dab33bef22dea5c166d990b921e (patch) | |
| tree | e93263669c1fc368bfaba62386afd147d671efb9 /merge-recursive.c | |
| parent | merge-ort: drop custom err() function (diff) | |
| download | git-1c9419ae9d262dab33bef22dea5c166d990b921e.tar.gz git-1c9419ae9d262dab33bef22dea5c166d990b921e.zip | |
merge-ort: stop passing "opt" to read_oid_strbuf()
This function doesn't look at its merge_options parameter. It used to
pass it down to err(), but that function no longer exists (and didn't
look at "opt" anyway). We can drop it here.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions