changelog
fix some hash based conflict resolution bugs and add tests for it
- Sun, 06 Oct 2019 13:27:24 +0200
- by Olaf Wintermann <olaf.wintermann@gmail.com> [Sun, 06 Oct 2019 13:27:24 +0200] rev 650
- fix some hash based conflict resolution bugs and add tests for it
