[meld] For conflicts, use MERGED by default, don't change permissions if file is the same

[Kai Willadsen <kaiw src gnome org>]

commit b176156eb9f3f99af30813edebc4a2241517ec04
Author: Louis des Landes <louis obsidian com au>
Date:   Wed Mar 20 17:50:43 2013 +1100

    For conflicts, use MERGED by default, don't change permissions if file is the same

 meld/vcview.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index 96bfe56..cdb1a5d 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -476,14 +476,16 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                     # for other, base and this, then set the output to
                     # the current file.
 
-                    conflicts = (tree.CONFLICT_OTHER, tree.CONFLICT_BASE,
+                    conflicts = (tree.CONFLICT_OTHER, tree.CONFLICT_MERGED,
                                  tree.CONFLICT_THIS)
                     diffs = [self.vc.get_path_for_conflict(path, conflict=c)
                              for c in conflicts]
 
                     for conflict_path in diffs:
-                        os.chmod(conflict_path, 0o444)
-                        _temp_files.append(conflict_path)
+                        # If this is the actual file, don't touch it.
+                        if conflict_path != path:
+                            os.chmod(conflict_path, 0o444)
+                            _temp_files.append(conflict_path)
 
                     # If we want to use auto-merge or use the merged
                     # output given by the VCS