Conflicts: Detect and show in issues tab
authorChristian Kamm <mail@ckamm.de>
Wed, 12 Jul 2017 08:57:41 +0000 (10:57 +0200)
committerChristian Kamm <mail@ckamm.de>
Thu, 13 Jul 2017 09:48:10 +0000 (11:48 +0200)
commit2cdf5517cb992b17a1fca5e532ae2cc7cbe3db31
treead7074f62e3f62d6a28f5c4d625c7b380aa976e2
parent7adcb76f682b9df86d2f7caa5af230b29f7d29cc
Conflicts: Detect and show in issues tab

Incidentally fixes a potential issue where conflicts were silently-
ignored and thus deleted if the parent folder was deleted.
csync/src/csync.h
csync/src/csync_exclude.c
csync/src/csync_exclude.h
csync/src/csync_update.c
src/gui/folder.cpp
src/gui/issueswidget.cpp
src/libsync/syncengine.cpp
src/libsync/syncfileitem.h
src/libsync/syncresult.cpp
src/libsync/syncresult.h