diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-22 17:01:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-22 17:01:36 -0700 |
| commit | fb6e6e06d5b7de6aacae6268712f3733d51cb38e (patch) | |
| tree | c0644f464b0a918beaf17817c67d813ddb9f9263 /merge-recursive.c | |
| parent | 5c0f9933ece11cf194cf33d7322aa798eb6375c3 (diff) | |
| parent | 24c5a270d10a7857cc3f0e6f3b04933f69ee2c8c (diff) | |
| download | git-fb6e6e06d5b7de6aacae6268712f3733d51cb38e.tar.gz | |
Merge branch 'jk/ort-unused-parameter-cleanups'
Code clean-up.
* jk/ort-unused-parameter-cleanups:
merge-ort: lowercase a few error messages
merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
merge-ort: drop unused parameters from detect_and_process_renames()
merge-ort: stop passing "opt" to read_oid_strbuf()
merge-ort: drop custom err() function
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6a4081bb0f..0d7e57e2df 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1383,12 +1383,12 @@ static int merge_mode_and_contents(struct merge_options *opt, extra_marker_size); if ((merge_status < 0) || !result_buf.ptr) - ret = err(opt, _("Failed to execute internal merge")); + ret = err(opt, _("failed to execute internal merge")); if (!ret && write_object_file(result_buf.ptr, result_buf.size, OBJ_BLOB, &result->blob.oid)) - ret = err(opt, _("Unable to add %s to database"), + ret = err(opt, _("unable to add %s to database"), a->path); free(result_buf.ptr); |