Feature #1423

- #1423 sync vs. push, pull, merge collision avoidance.
2013-11-03 12:04:21 -05:00
parent 56d8734e1a
commit 8c9bc99af6
7 changed files with 13 additions and 13 deletions
--- a/1
+++ b/1
@@ -17,6 +17,7 @@ Features
 + #1297 The task₋sync(5) man pages is rewritten with examples.
 + #1339 The configuration file now supports JSON encoding of Unicode
   characters, by specifying \uNNNN.
+ + #1423 sync vs. push, pull, merge collision avoidance.
 + #1385 Need a way to configure the trust of self-signed certificates.
 + Stores un-synched transactions in <data.location>/backlog.data.
 + Adds a new 'synchronize' command to sync data with a task server.