Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: 28dadeb99071e1ae500e810247c6aeb7f8d0caa8 https://github.com/openSUSE/open-build-service/commit/28dadeb99071e1ae500e81... Author: Michael Schroeder Date: 2018-04-09 (Mon, 09 Apr 2018) Changed paths: M src/backend/bs_mergechanges Log Message: ----------- [backend] be more clever in bs_mergechanges Now does something like a 3-way merge.