From 116f83e6790faee558d61ccaf16ddad937ca5010 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 26 Feb 2017 11:53:54 +0000
Subject: [PATCH] git merge: don't fail if file content can't be retrieved

The merge button should be disabled in this case,
but let's avoid the exception as it is done for other revisions.
---
 plugins/git4idea/src/git4idea/merge/GitMergeProvider.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
index 06d687397fed..e9e561eba345 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
@@ -134,7 +134,13 @@ public class GitMergeProvider implements MergeProvider2 {
           catch (Exception ex) {
             /// unable to load original revision, use the current instead
             /// This could happen in case if rebasing.
-            mergeData.ORIGINAL = file.contentsToByteArray();
+            try {
+              mergeData.ORIGINAL = file.contentsToByteArray();
+            }
+            catch (IOException e) {
+              LOG.error(e);
+              mergeData.ORIGINAL = ArrayUtil.EMPTY_BYTE_ARRAY;
+            }
           }
           mergeData.CURRENT = loadRevisionCatchingErrors(current);
           mergeData.LAST = loadRevisionCatchingErrors(last);