mergeview: fix uninitialised-var error

Forgot to make sure 'diff' was set.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/python/lib-mergeview.py b/python/lib-mergeview.py
index 5de79fd5c3453a62c14063e506b245e3499068ce..442371e8d3d4802698251a5a52446eb0179da476 100644 (file)
--- a/python/lib-mergeview.py
+++ b/python/lib-mergeview.py
@@ -100,6 +100,8 @@ class MergePane(edlib.Pane):
             diff = focus.call("copy:get", ret='str')
             if not diff or not diff.startswith("|||||||"):
                 diff = None
+        else:
+            diff = None
         if diff:
             # selection must be full lines
             focus.call("doc:EOL", -1, pt)