Carlos Martín Nieto bc8b29b4f3 Repository: allow passing a favor option to merge_commits ...

I've gone with taking a string and converting it because the depth of
the namespacing in the libgit2 name is rather large and we don't care
about the global namespace that C has; and this also lets us pass the
same as the '-X' option to git-merge.

2014-10-30 16:21:22 +01:00

17 KiB

Raw Blame History

View Raw