search

GoBoundless / dyph

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

RFR: Merge results class #42

Closed aamontal closed 8 years ago

aamontal commented 8 years ago

The results of merges now get wrapped in more explicit classes, resolved and conflicted. The former output was a hash with a type key.

Also includes changes to the output type, which used to be an array with positional values, is now a merge_result class that has info about success, conflict etc.