Bug - merge command resulted in an error if

completed/deleted tasks were overwritten with pending tasks

src/TDB.cpp

@@ -991,6 +991,10 @@ void TDB::undo ()
 ////////////////////////////////////////////////////////////////////////////////
 void TDB::merge (const std::string& mergeFile)
 {
+  ///////////////////////////////////////
+  // Copyright 2010, Johannes Schlatow.
+  ///////////////////////////////////////
+
   // list of modifications that we want to add to the local database
   std::list<Taskmod> mods;
 
@@ -1224,7 +1228,7 @@ void TDB::merge (const std::string& mergeFile)
           DEBUG_STR("  concat the first match to left branch");
           // concat the oldest (but still newer) modification on the right
           // to the endpoint on the left
-          mods.front().setBefore(tmod_l.getBefore());
+          mods.front().setBefore(tmod_l.getAfter());
         }
       }
     } // for

src/Taskmod.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // task - a command line task list manager.
 //
-// Copyright 2006 - 2010, Paul Beckingham.
+// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
 // All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify it under

src/Taskmod.h

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // task - a command line task list manager.
 //
-// Copyright 2006 - 2010, Paul Beckingham.
+// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow.
 // All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify it under