gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Code Cleanup

Browse Source
This commit is contained in:
Louis-Claude Canon
2012-06-16 17:19:43 +02:00
committed by Paul Beckingham
parent 3cea8889e3
commit e5fe704f6a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/TDB2.cpp
View File

@@ -688,8 +688,6 @@ void TDB2::merge (const std::string& mergeFile)
} }
} }
std::cout << "\n";
/////////////////////////////////////// ///////////////////////////////////////
// branch-off point found: // branch-off point found:
if (found) if (found)
@@ -912,10 +910,10 @@ void TDB2::merge (const std::string& mergeFile)
} }
else if (rit == r.end ()) else if (rit == r.end ())
{ {
// nothing happend on the remote branch // nothing happened on the remote branch
// local branch is up-to-date // local branch is up-to-date
// nothing happend on the local branch either // nothing happened on the local branch either
// break, to suppress autopush // break, to suppress autopush
if (lit == l.end ()) if (lit == l.end ())