diff options
Diffstat (limited to 'merge-ort.h')
| -rw-r--r-- | merge-ort.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.h b/merge-ort.h index c4909bcbf9..a994c9a5fc 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -87,6 +87,7 @@ void merge_switch_to_result(struct merge_options *opt, * so only call this when bypassing merge_switch_to_result(). */ void merge_display_update_messages(struct merge_options *opt, + int detailed, struct merge_result *result); struct stage_info { |