[meld: 9/63] filemerge: Remove the hack to avoid a flash of unmerged text

[Kai Willadsen <kaiw src gnome org>]

commit 1fc308af58244d51dd6fce384ed9844313105786
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 19 10:22:01 2015 +1000

    filemerge: Remove the hack to avoid a flash of unmerged text
    
    This isn't that bad anyway, and it's making it harder to refactor
    FileDiff's loading flow.

 meld/filemerge.py |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/meld/filemerge.py b/meld/filemerge.py
index 8d3d637..c3f4a7d 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -16,7 +16,6 @@
 
 from meld.conf import _
 from . import filediff
-from . import meldbuffer
 from . import merge
 from . import recent
 
@@ -35,13 +34,11 @@ class FileMerge(filediff.FileDiff):
         return recent.TYPE_MERGE, comp[1]
 
     def _set_files_internal(self, files):
-        self.textview[1].set_buffer(meldbuffer.MeldBuffer())
         self._load_files(files, self.textbuffer)
 
     def _compare_files_internal(self):
         for i in self._merge_files():
             yield i
-        self.textview[1].set_buffer(self.textbuffer[1])
         for i in self._diff_files():
             yield i