[meld] Fix is_temp being passed to the actual diff emit

[Kai Willadsen <kaiw src gnome org>]

commit 740cce8a64deaaa19a89675f4aeee0b7c93b272f
Author: Louis des Landes <louis obsidian com au>
Date:   Wed Mar 27 12:14:41 2013 +1100

    Fix is_temp being passed to the actual diff emit

 meld/vcview.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index 762181a..a0c54d4 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -480,12 +480,13 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                                  tree.CONFLICT_THIS)
                     diffs = [self.vc.get_path_for_conflict(path, conflict=c)
                              for c in conflicts]
-
                     for conflict_path, is_temp in diffs:
                         # If this is the actual file, don't touch it.
                         if conflict_path != path and is_temp:
                             os.chmod(conflict_path, 0o444)
                             _temp_files.append(conflict_path)
+                    # create-diff expects only the paths
+                    diffs = [path for path, is_temp in diffs]
 
                     # If we want to use auto-merge or use the merged
                     # output given by the VCS