Enhancement

- Output error, header, footnote and debug messages on standard error.

src/commands/CmdCustom.cpp

@@ -147,7 +147,6 @@ int CmdCustom::execute (std::string& output)
   if (maxlines)
     maxlines -= (context.verbose ("blank") ? 1 : 0)
               + table_header
-              + (context.verbose ("footnote") ? context.footnotes.size () : 0)
               + 1;  // "X tasks shown ..."
 
   // Render.
@@ -161,6 +160,7 @@ int CmdCustom::execute (std::string& output)
         << view.render (filtered, sequence)
         << optionalBlankLine ();
 
+    // Print the number of rendered tasks
     if (context.verbose ("affected"))
     {
       out << (filtered.size () == 1

src/commands/CmdEdit.cpp

@@ -691,7 +691,7 @@ ARE_THESE_REALLY_HARMFUL:
 
     if (oops)
     {
-      std::cout << STRING_ERROR_PREFIX << problem << "\n";
+      std::cerr << STRING_ERROR_PREFIX << problem << "\n";
 
       // Preserve the edits.
       before = after;

src/commands/CmdMerge.cpp

@@ -89,7 +89,22 @@ int CmdMerge::execute (std::string& output)
     else
       file = uri._path;
 
-    context.tdb2.merge (file);
+    // XXX the following function could indicate whether a modification was
+    // performed without an exception (by returning a boolean, within a status
+    // object or with a specific function)
+    try
+    {
+        context.tdb2.merge (file);
+    }
+    catch (std::string& e) {
+        if (e == STRING_TDB2_UP_TO_DATE)
+        {
+            output += e + "\n";
+            return 0;
+        }
+        else
+            throw e;
+    }
 
     output += std::string (STRING_CMD_MERGE_COMPLETE) + "\n";
 

src/commands/CmdShell.cpp

@@ -113,7 +113,7 @@ int CmdShell::execute (std::string&)
 
       catch (std::string& error)
       {
-        std::cout << error << "\n";
+        std::cerr << error << "\n";
       }
 
       catch (...)