Merge branch '1.9.3' of tasktools.org:task into 1.9.3

This commit is contained in:
Federico Hernandez 2010-10-26 21:16:34 +02:00
commit 62d2c6bb5f

View file

@ -1559,7 +1559,7 @@ void TDB::merge (const std::string& mergeFile)
{
std::cout << "Merging new remote task "
<< (useColor ? colorAdded.colorize (uuid) : uuid)
<< " \"" << cutOff (tmod.getBefore ().get ("description"), 10) << "\""
<< " \"" << cutOff (tmod.getAfter ().get ("description"), 10) << "\""
<< "\n";
// remove the \n from composeF4() string