buttercup-core
buttercup-core copied to clipboard
Merge/Update from conflict files
Support for merging conflict files which sometimes appear on various cloud storage platforms.