X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=64b20cce2427fcf0cd9565f5e24efce78abb0088;hb=8dd84b0169864f638516b82df40b0a3ef6e2cb92;hp=8a8fe3863a002ea6b62a760d5413dfe0fd0ffde7;hpb=a814deca8b42e43fa6bbcfed1c2fe93131722b31;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 8a8fe386..64b20cce 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -608,6 +608,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 	int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
 	mmfile_t result_file;
 
+	context = opt->context;
 	/* Read the result of merge first */
 	if (!working_tree_file)
 		result = grab_blob(elem->sha1, &result_size);