[meld] Fix undefined variable use in merge module

[Kai Willadsen <kaiw src gnome org>]

commit aff98a3e9cb937e2770c3ca62cde9338068a2b71
Author: Piotr Piastucki <the_leech users berlios de>
Date:   Sun Feb 27 23:01:27 2011 +0100

    Fix undefined variable use in merge module

 meld/merge.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/merge.py b/meld/merge.py
index b1596c3..9e47f10 100644
--- a/meld/merge.py
+++ b/meld/merge.py
@@ -125,10 +125,10 @@ class AutoMergeDiffer(diffutil.Differ):
 
                         if seq0:
                             out0 = ('conflict', i0, seq0[2], seq0[3], seq0[4])
-                            out1 = ('conflict', i1, i1 + seq0[2] - i0, end1, end1 + seq0[2] - i0)
+                            out1 = ('conflict', i0, seq0[2], end1, end1 + seq0[2] - i0)
                             yield out0, out1
                         elif seq1:
-                            out0 = ('conflict', i0, i0 + seq1[2] - i1, end0, end0 + seq2[2] - i1)
+                            out0 = ('conflict', i1, seq1[2], end0, end0 + seq1[2] - i1)
                             out1 = ('conflict', i1, seq1[2], seq1[3], seq1[4])
                             yield out0, out1
                         return