[meld] Fix tag replacement in blank line ignoring



commit 7c03796365c2a757aa63f516e1d49a01b3e39724
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jan 18 05:33:41 2013 +1000

    Fix tag replacement in blank line ignoring

 meld/diffutil.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/diffutil.py b/meld/diffutil.py
index 20c764d..c80bf93 100644
--- a/meld/diffutil.py
+++ b/meld/diffutil.py
@@ -55,9 +55,9 @@ def consume_blank_lines(chunk, texts, pane1, pane2):
     if c1 == c2 and c3 == c4:
         return None
     if c1 == c2 and tag == "replace":
-        c0 = "insert"
+        tag = "insert"
     elif c3 == c4 and tag == "replace":
-        c0 = "delete"
+        tag = "delete"
     return DiffChunk._make((tag, c1, c2, c3, c4))
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]