diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-14 16:39:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:39:14 -0700 |
| commit | c621197a20d42b6b9115d7031bdb49e24f961898 (patch) | |
| tree | 2cab7ba24afa0566325578946c8d338e09d42c10 /combine-diff.c | |
| parent | Merge branch 'lt/config' into next (diff) | |
| parent | git diff: support "-U" and "--unified" options properly (diff) | |
| download | tgif-c621197a20d42b6b9115d7031bdb49e24f961898.tar.xz | |
Merge branch 'lt/diff' into next
* lt/diff:
git diff: support "-U" and "--unified" options properly
include header to define uint32_t, necessary on Mac OS X
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); |