tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Provide 'git merge --abort' as a synonym to 'git reset --merge'
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index 17873f3d9e88fccbf98e790d243397dcc4ccb24b..782896db55e686608aecf911e3ecb3ce129b6de5 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-2814,7
+2814,6
@@
static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
void diff_setup(struct diff_options *options)
{
memset(options, 0, sizeof(*options));
- memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));
options->file = stdout;