diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-05 23:55:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-05 23:55:45 -0800 |
| commit | a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8 (patch) | |
| tree | c7f414f8d89f51a19ff04ad04f19f25ecc643e6b /diff-files.c | |
| parent | 12db4852de8d377d317e5a7cf11467e5d4c5773d (diff) | |
| parent | 45392a648d7449d237ecc2507bc92378bf920bf0 (diff) | |
| download | git-a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8.tar.gz git-a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8.tar.xz | |
Merge branch 'jc/diff'
* jc/diff:
git-diff-tree --stdin: show all parents.
combine-diff: remove misguided --show-empty hack.
Diffstat (limited to 'diff-files.c')
| -rw-r--r-- | diff-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c index 4cafd3ea2..4ba59f1a2 100644 --- a/diff-files.c +++ b/diff-files.c @@ -160,7 +160,7 @@ int main(int argc, const char **argv) if (combine_merges && num_compare_stages == 2) { show_combined_diff(&combine.p, 2, dense_combined_merges, - NULL, 0); + NULL); free(combine.p.path); continue; } |