Commit 2854e61956871f7b26ee38040e70f6db92796c1a

Carlos Martín Nieto 2017-01-14T17:12:23

Merge pull request #4061 from libgit2/ethomson/merge_opts merge: set default rename threshold