Merge branch 'tz/send-email-helpfix'

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index 7857ce9fbd18e5575ae998c710a8b6c4e5f67427..6491070d965835f9202b68fbdae72cb6cd6c987f 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1902,6 +1902,7 @@ static void initialize_attr_index(struct merge_options *opt)
        struct index_state *attr_index = &opt->priv->attr_index;
        struct cache_entry *ce;
 
+       attr_index->repo = opt->repo;
        attr_index->initialized = 1;
 
        if (!opt->renormalize)
@@ -2036,7 +2037,7 @@ static int handle_content_merge(struct merge_options *opt,
         * the three blobs to merge on various sides of history.
         *
         * extra_marker_size is the amount to extend conflict markers in
-        * ll_merge; this is neeed if we have content merges of content
+        * ll_merge; this is needed if we have content merges of content
         * merges, which happens for example with rename/rename(2to1) and
         * rename/add conflicts.
         */