diff options
author | Elijah Newren <newren@gmail.com> | 2025-03-13 02:46:38 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-03-18 09:48:51 -0700 |
commit | 3965976edb5b8693cbecfd39ad8438eec311403b (patch) | |
tree | 99bfbc149b021d242d9a46df49668e0bf08fba7a /builtin/commit-tree.c | |
parent | a707d4f941c82759d2eb3f1f89fc1e4232df98d1 (diff) |
merge-ort: support having merge verbosity be set to 0
Various callers such as am & checkout set the merge verbosity to 0 to
avoid having conflict messages printed. While this could be achieved by
avoiding the wrappers from merge-ort-wrappers and instead passing 0 for
display_update_msgs to merge_switch_to_result(), for simplicity of
converting callers simply allow them to also achieve this with the
merge-ort-wrappers by setting verbosity to 0.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions