test/bin-test/testdir/file3@5e6df4f502d3
test/bin-test/testdir/file3
Wed, 10 Apr 2019 12:54:24 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 10 Apr 2019 12:54:24 +0200
- changeset 561
- 5e6df4f502d3
- parent 422
- 1429fb385513
- permissions
- -rw-r--r--
harmonizes output of push and pull
pull gets conflict counter, push uses the term conflict instead of skipped (the output also says conflict: ...)
