projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: --branch-all-refs / -B support
[git.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index
8a8fe38
..
64b20cc
100644
(file)
--- 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;
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);
/* Read the result of merge first */
if (!working_tree_file)
result = grab_blob(elem->sha1, &result_size);