GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-21 07:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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:
if (found)
@ -912,10 +910,10 @@ void TDB2::merge (const std::string& mergeFile)
}
else if (rit == r.end ())
{
// nothing happend on the remote branch
// nothing happened on the remote branch
// local branch is up-to-date
// nothing happend on the local branch either
// nothing happened on the local branch either
// break, to suppress autopush
if (lit == l.end ())