diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 01:20:25 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:12 -0500 |
| commit | 6b92c99bcbf32de131754a4f750278f84bf5b766 (patch) | |
| tree | d926d73f374fa89f2a343a601c87cabbc6d4b7f6 /src/merge.h | |
| parent | c1d648c5c6361edfb1aa85a31656b628672c7616 (diff) | |
| download | libgit2-6b92c99bcbf32de131754a4f750278f84bf5b766.tar.gz | |
Don't try to merge binary files
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index b240f6c44..dda023528 100644 --- a/src/merge.h +++ b/src/merge.h @@ -106,6 +106,8 @@ typedef struct { git_index_entry their_entry; git_delta_t their_status; + + int binary:1; } git_merge_diff; /** Internal structure for merge inputs */ |