changelog
increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
- Fri, 12 Apr 2019 11:13:16 +0200
- by Olaf Wintermann <olaf.wintermann@gmail.com> [Fri, 12 Apr 2019 11:13:16 +0200] rev 566
- increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
