A few small cleanups for merge-ort collected from playing with -Wunused-parameter. The first one actually fixes a user-visible bug, and the rest are just cleanups. [1/4]: merge-ort: drop custom err() function [2/4]: merge-ort: stop passing "opt" to read_oid_strbuf() [3/4]: merge-ort: drop unused parameters from detect_and_process_renames() [4/4]: merge-ort: drop unused "opt" parameter from merge_check_renames_reusable() merge-ort.c | 48 +++++++++++-------------------------------- t/t6406-merge-attr.sh | 3 ++- 2 files changed, 14 insertions(+), 37 deletions(-) -Peff
