diff options
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 52deb36594..07f54e409f 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4226,6 +4226,7 @@ void merge_switch_to_result(struct merge_options *opt, /* failure to function */ result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "checkout", opt->repo); return; } trace2_region_leave("merge", "checkout", opt->repo); @@ -4237,6 +4238,8 @@ void merge_switch_to_result(struct merge_options *opt, opt->priv = NULL; result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "record_conflicted", + opt->repo); return; } opt->priv = NULL; |