changelog
rename conflict test script
- Sun, 25 Aug 2019 09:43:12 +0200
- by Olaf Wintermann <olaf.wintermann@gmail.com> [Sun, 25 Aug 2019 09:43:12 +0200] rev 632
- rename conflict test script
add pull conflict detection tests
- Sat, 24 Aug 2019 23:34:16 +0200
- by Olaf Wintermann <olaf.wintermann@gmail.com> [Sat, 24 Aug 2019 23:34:16 +0200] rev 631
- add pull conflict detection tests
