diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-12 09:43:53 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:09 -0700 |
| commit | d9fdee6e4cb87e4531d9ddba92b44e5323e794da (patch) | |
| tree | d243e3feb5fadcf806e674fd786ff8330ae7d95b /src/merge.h | |
| parent | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (diff) | |
| download | libgit2-d9fdee6e4cb87e4531d9ddba92b44e5323e794da.tar.gz | |
Remove `git_merge_result` as it's now unnecessary
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, |