easyxtarget/libelektra — pull request #2 by fberlakovich (2014-07-04 16:47:03+00:00)
Title: Improvements to the merging code

I reimplemented the merging algorithm with a cleaner interface. But further changes are likely due to the integration of conflict strategies