From 41f2520094792589fd71331f0d6021670640acb9 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 8 Aug 2010 00:05:01 -0400 Subject: [PATCH] Documentation - Added merge command to the NEWS file. --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index c8b7961a7..75f33b519 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ New Features in task 1.9.3 - Now defines an overdue task as being one second after the due date, instead of the day after the due date. - Import and export of YAML 1.1, including round-trip capability. + - New merge capability for syncing task data files. Please refer to the ChangeLog file for full details. There are too many to list here. @@ -21,6 +22,8 @@ New commands in task 1.9.3 and color rules from your .taskrc and theme. - New 'task export.yaml' command will export YAML 1.1, which can then be imported via 'task import '. + - New 'task merge ' command that can merge the local and an undo.data + file from another task user, to sync across machines, for example. New configuration options in task 1.9.3