From a8c8bf46710fd36da81dd32bcb40fd87d6c920fb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 7 Aug 2010 20:14:01 -0400
Subject: [PATCH] Documentation

- Added the 'merge' command to the help output.
---
 src/report.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/report.cpp b/src/report.cpp
index 6640781f7..9a43e8dad 100644
--- a/src/report.cpp
+++ b/src/report.cpp
@@ -201,6 +201,10 @@ int shortUsage (std::string &outs)
   table.addCell (row, 1, "task export");
   table.addCell (row, 2, "Lists all tasks in CSV format.  Alias to export.csv");
 
+  row = table.addRow ();
+  table.addCell (row, 1, "task merge FILE");
+  table.addCell (row, 2, "Merges the specified undo.data file with the local data files.");
+
   row = table.addRow ();
   table.addCell (row, 1, "task export.ical");
   table.addCell (row, 2, "Lists all tasks in iCalendar format.");