merge: import GIT_MERGE_PREFERENCE flags

libgit2 / pygit2

Python bindings for libgit2

https://www.pygit2.org/

Other

1.59k stars 383 forks source link

merge: import GIT_MERGE_PREFERENCE flags #1071

Closed pmrowla closed 3 years ago

pmrowla commented 3 years ago

repo.merge_analysis() returns a tuple of (analysis, preference) where the first field is GIT_MERGE_ANALYSIS... flags and the second is GIT_MERGE_PREFERENCE... flags, but the git_merge_preference_t names are not currently accessible in pygit