changelog
- Wed, 10 Apr 2019 12:54:24 +0200
- by Mike Becker <universe@uap-core.de> [Wed, 10 Apr 2019 12:54:24 +0200] rev 561
- harmonizes output of push and pull
pull gets conflict counter, push uses the term conflict instead of skipped (the output also says conflict: ...)