]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb012d2) | patch
Conflicts: Use the local mtime for the conflict file name #5273
authorChristian Kamm <mail@ckamm.de>
Tue, 8 Nov 2016 10:22:53 +0000 (11:22 +0100)
committerckamm <mail@ckamm.de>
Tue, 8 Nov 2016 13:47:51 +0000 (14:47 +0100)
commitf1f27221a7b7fdc995a22dddee18e7399b6402d9
treec6d1699c635e209e09d3664cd123f146495bc30btree | snapshot
parenteb012d26eee30d50d222075c23185f03932d80b1commit | diff
Conflicts: Use the local mtime for the conflict file name #5273

Otherwise local conflict files may be overridden in a restore
situation. See ticket for details.
csync/tests/ownCloud/t7.pl diff | blob | history
src/libsync/propagatedownload.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.