Mercurial > hg > dav / changelog

harmonizes output of push and pull

• 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: ...)

store origin of file conflicts

• Wed, 10 Apr 2019 11:03:37 +0200
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Wed, 10 Apr 2019 11:03:37 +0200] rev 560
• store origin of file conflicts

fixes missing return in copy_file()

• Tue, 09 Apr 2019 18:23:23 +0200
• by Mike Becker <universe@uap-core.de> [Tue, 09 Apr 2019 18:23:23 +0200] rev 559
• fixes missing return in copy_file()