diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-13 19:53:35 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-14 16:16:22 +0200 |
| commit | 6fefb7af84170fb67a7e6c8493fc00421787bb87 (patch) | |
| tree | 68c8b22d3e7653eb6c884da5a0b4c38da27ea040 /src/merge.c | |
| parent | 103b7d21226e43192cf138ecf0b98b51796ae0ed (diff) | |
| download | libgit2-6fefb7af84170fb67a7e6c8493fc00421787bb87.tar.gz | |
Capture conflict information in MERGE_MSG for revert and merge
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |