diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2015-03-16 15:54:53 -0400 |
|---|---|---|
| committer | Jeff Hostetler <jeffhost@microsoft.com> | 2015-03-16 15:54:53 -0400 |
| commit | fea24c5300f43ea4989c43f0057bb009d7e9653a (patch) | |
| tree | 226bb8f3dc51b633465a981e16cc4bb07f0b8ff0 /src/merge.h | |
| parent | d675982a15388d8c413acda139b4662062cf3286 (diff) | |
| download | libgit2-fea24c5300f43ea4989c43f0057bb009d7e9653a.tar.gz | |
PERF: In MERGE, lazily compute is_binary
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 2684c15f8..fe4505f8b 100644 --- a/src/merge.h +++ b/src/merge.h @@ -107,7 +107,6 @@ typedef struct { git_index_entry their_entry; git_delta_t their_status; - int binary:1; } git_merge_diff; int git_merge__bases_many( |