diff options
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/merge.h b/src/merge.h index 44c808dfa..2362da04d 100644 --- a/src/merge.h +++ b/src/merge.h @@ -120,16 +120,6 @@ struct git_merge_head { git_commit *commit; }; -/** Internal structure for merge results */ -struct git_merge_result { - bool is_uptodate; - - bool is_fastforward; - git_oid fastforward_oid; - - git_index *index; -}; - int git_merge__bases_many( git_commit_list **out, git_revwalk *walk, |