changelog
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
- Fri, 18 Mar 2016 12:38:30 +0100
- by Olaf Wintermann <olaf.wintermann@gmail.com> [Fri, 18 Mar 2016 12:38:30 +0100] rev 219
- added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
