Merge

- fixed if statement
2010-10-25 18:53:44 +02:00
parent 6dca4dd056
commit 9eed851fbb
1 changed files with 1 additions and 1 deletions
--- a/src/TDB.cpp
+++ b/src/TDB.cpp
@@ -1387,7 +1387,7 @@ void TDB::merge (const std::string& mergeFile)
    // nothing happend on the local branch either

    // break, to suppress autopush
-    if (lit != l.end ())
+    if (lit == l.end ())
    {
      mods.clear ();
      lmods.clear ();