diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:15:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:15:33 -0700 |
| commit | e78f8291436753d98829f32cf5308fd99d59971b (patch) | |
| tree | 55d951dae236290f38f8888f2c44b0b9a04b89c0 /diffcore.h | |
| parent | Merge branch 'nk/branch-v-abbrev' (diff) | |
| parent | combine-diff: support format_callback (diff) | |
| download | tgif-e78f8291436753d98829f32cf5308fd99d59971b.tar.xz | |
Merge branch 'jc/combine-diff-callback'
* jc/combine-diff-callback:
combine-diff: support format_callback
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index b8f1fdecf4..8f32b824cd 100644 --- a/diffcore.h +++ b/diffcore.h @@ -45,7 +45,7 @@ struct diff_filespec { unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ #define DIRTY_SUBMODULE_UNTRACKED 1 #define DIRTY_SUBMODULE_MODIFIED 2 - + unsigned has_more_entries : 1; /* only appear in combined diff */ struct userdiff_driver *driver; /* data should be considered "binary"; -1 means "don't know yet" */ int is_binary; |