diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-15 18:09:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 18:09:15 -0700 |
| commit | 05f743f328e56780fb86c57da65f41df6e3b19a3 (patch) | |
| tree | 81c3fc843da2a1d500ba781f473ecc9eb6684a9b /combine-diff.c | |
| parent | d55aaefa3e3920bdf9a52d80da2a244f72742228 (diff) | |
| parent | ee1e5412a702674d4da95a4aef73a73d2834dcc3 (diff) | |
| download | git-05f743f328e56780fb86c57da65f41df6e3b19a3.tar.gz | |
Merge branch 'lt/diff'
* lt/diff:
git diff: support "-U" and "--unified" options properly
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 8a8fe3863a..64b20cce24 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); |