search

GoBoundless / dyph

A library of useful diffing algorithms for Ruby
https://www.boundless.com/
MIT License
8 stars 2 forks source link

Differ's merge_text's body result now is a single string instead of an... #5

Closed kevinmook closed 10 years ago

kevinmook commented 10 years ago

... array. Also add a 'include_base' option that, if set to false, will exclude the base in conflicts