From 9eed851fbb399419714b2770799b30025ad87208 Mon Sep 17 00:00:00 2001
From: Johannes Schlatow <johannes@schlatow.name>
Date: Mon, 25 Oct 2010 18:53:44 +0200
Subject: [PATCH] Merge

- fixed if statement
---
 src/TDB.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TDB.cpp b/src/TDB.cpp
index f868d1da2..aeb715edf 100644
--- 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 ();