3 Commits (7efa1ca52595ae6533342aaee90bc969d3bedce8)

Author	SHA1	Message	Date
BoOTheFurious	023dd07b1c	Fix logic related to merge operator settings (#481)	4 years ago
Stanislav Tkach	4a064d0f72	Use pretty_assertions in tests (#451)	5 years ago
Nelson Elhage	bc07d0cd28	Don't segfault on failed a merge operator. (#437)	5 years ago