[meld] Fix merge mode targetting incorrect paths

[Kai Willadsen <kaiw src gnome org>]

commit e2de0fc2aacc511d22ba427163c0fcc8b9024323
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Apr 23 18:46:23 2013 +1000

    Fix merge mode targetting incorrect paths

 meld/vcview.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index 6e95cf2..6a26ea0 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -498,7 +498,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                             os.chmod(conflict_path, 0o444)
                             _temp_files.append(conflict_path)
                     # create-diff expects only the paths
-                    diffs = [path for path, is_temp in diffs]
+                    diffs = [p for p, is_temp in diffs]
 
                     # If we want to use auto-merge or use the merged
                     # output given by the VCS