From 6fefb7af84170fb67a7e6c8493fc00421787bb87 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Sun, 13 Apr 2014 19:53:35 +0200 Subject: Capture conflict information in MERGE_MSG for revert and merge --- src/merge.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/merge.c') diff --git a/src/merge.c b/src/merge.c index 371fad776..10c19b5c5 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2662,6 +2662,7 @@ int git_merge( if ((error = git_merge_trees(&index_new, repo, ancestor_tree, our_tree, their_trees[0], merge_opts)) < 0 || (error = git_merge__indexes(repo, index_new)) < 0 || (error = git_repository_index(&index_repo, repo)) < 0 || + (error = git_merge__append_conflicts_to_merge_msg(repo, index_repo)) < 0 || (error = git_checkout_index(repo, index_repo, &checkout_opts)) < 0) goto on_error; -- cgit v1.2.1