On Sat, Jul 6, 2019 at 6:00 PM Edmundo Carmona Antoranz
<eantoranz@xxxxxxxxx> wrote:
> @@ -1645,6 +1631,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> * auto resolved the merge cleanly.
> */
> if (automerge_was_ok) {
> + write_tree_trivial(&result_tree);
> ret = finish_automerge(head_commit, head_subsumed,
> common, remoteheads,
> &result_tree, wt_strategy);
I realized later that the call to write_tree_trivial could be included
in finish_automerge. Will include this change on v2 of the patch (if
there's a v2, depending on feedback).
