From e5fe704f6a8b1bf2548f8ccec0f7b97166e1ae4b Mon Sep 17 00:00:00 2001 From: Louis-Claude Canon Date: Sat, 16 Jun 2012 17:19:43 +0200 Subject: [PATCH] Code Cleanup --- src/TDB2.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/TDB2.cpp b/src/TDB2.cpp index 903aaba33..3fd34e1e9 100644 --- a/src/TDB2.cpp +++ b/src/TDB2.cpp @@ -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 ())