diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index 3eef33d..7ef25a7 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -100,8 +100,18 @@
     def isDifferentFromAuthor: Boolean = authorName != committerName || authorEmailAddress != committerEmailAddress
   }
 
-  case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String],
-                      oldIsImage: Boolean, newIsImage: Boolean, oldObjectId: Option[String], newObjectId: Option[String])
+  case class DiffInfo(
+    changeType: ChangeType,
+    oldPath: String,
+    newPath: String,
+    oldContent: Option[String],
+    newContent: Option[String],
+    oldIsImage: Boolean,
+    newIsImage: Boolean,
+    oldObjectId: Option[String],
+    newObjectId: Option[String],
+    tooLarge: Boolean
+  )
 
   /**
    * The file content data for the file content view of the repository viewer.
@@ -495,11 +505,31 @@
           while(treeWalk.next){
             val newIsImage = FileUtil.isImage(treeWalk.getPathString)
             buffer.append((if(!fetchContent){
-              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None, None, false, newIsImage, None, Option(treeWalk.getObjectId(0)).map(_.name))
+              DiffInfo(
+                changeType  = ChangeType.ADD,
+                oldPath     = null,
+                newPath     = treeWalk.getPathString,
+                oldContent  = None,
+                newContent  = None,
+                oldIsImage  = false,
+                newIsImage  = newIsImage,
+                oldObjectId = None,
+                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
+                tooLarge    = false
+              )
             } else {
-              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None,
-                JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray),
-                false, newIsImage, None, Option(treeWalk.getObjectId(0)).map(_.name))
+              DiffInfo(
+                changeType  = ChangeType.ADD,
+                oldPath     = null,
+                newPath     = treeWalk.getPathString,
+                oldContent  = None,
+                newContent  = JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray),
+                oldIsImage  = false,
+                newIsImage  = newIsImage,
+                oldObjectId = None,
+                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
+                tooLarge    = false
+              )
             }))
           }
           (buffer.toList, None)
@@ -518,16 +548,52 @@
 
     import scala.collection.JavaConverters._
     git.getRepository.getConfig.setString("diff", null, "renames", "copies")
-    git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala.map { diff =>
-      val oldIsImage = FileUtil.isImage(diff.getOldPath)
-      val newIsImage = FileUtil.isImage(diff.getNewPath)
-      if(!fetchContent || oldIsImage || newIsImage){
-        DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath, None, None, oldIsImage, newIsImage, Option(diff.getOldId).map(_.name), Option(diff.getNewId).map(_.name))
+
+    val diffs = git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala
+    diffs.map { diff =>
+      if(diffs.size > 1){
+        DiffInfo(
+          changeType  = diff.getChangeType,
+          oldPath     = diff.getOldPath,
+          newPath     = diff.getNewPath,
+          oldContent  = None,
+          newContent  = None,
+          oldIsImage  = false,
+          newIsImage  = false,
+          oldObjectId = Option(diff.getOldId).map(_.name),
+          newObjectId = Option(diff.getNewId).map(_.name),
+          tooLarge    = true
+        )
       } else {
-        DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath,
-          JGitUtil.getContentFromId(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
-          JGitUtil.getContentFromId(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
-          oldIsImage, newIsImage, Option(diff.getOldId).map(_.name), Option(diff.getNewId).map(_.name))
+        val oldIsImage = FileUtil.isImage(diff.getOldPath)
+        val newIsImage = FileUtil.isImage(diff.getNewPath)
+        if(!fetchContent || oldIsImage || newIsImage){
+          DiffInfo(
+            changeType  = diff.getChangeType,
+            oldPath     = diff.getOldPath,
+            newPath     = diff.getNewPath,
+            oldContent  = None,
+            newContent  = None,
+            oldIsImage  = oldIsImage,
+            newIsImage  = newIsImage,
+            oldObjectId = Option(diff.getOldId).map(_.name),
+            newObjectId = Option(diff.getNewId).map(_.name),
+            tooLarge    = false
+          )
+        } else {
+          DiffInfo(
+            changeType  = diff.getChangeType,
+            oldPath     = diff.getOldPath,
+            newPath     = diff.getNewPath,
+            oldContent  = JGitUtil.getContentFromId(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
+            newContent  = JGitUtil.getContentFromId(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
+            oldIsImage  = oldIsImage,
+            newIsImage  = newIsImage,
+            oldObjectId = Option(diff.getOldId).map(_.name),
+            newObjectId = Option(diff.getNewId).map(_.name),
+            tooLarge    = false
+          )
+        }
       }
     }.toList
   }
diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index bc45d6c..c65d1c1 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -92,30 +92,38 @@
       <td style="padding: 0;">
         @if(diff.oldObjectId == diff.newObjectId){
           <div class="diff-same">File renamed without changes</div>
-        } else { @if(diff.newContent != None || diff.oldContent != None){
-          <div id="diffText-@i" class="diffText"></div>
-          <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath">@diff.newContent.getOrElse("")</textarea>
-          <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea>
-        } else { @if(diff.newIsImage || diff.oldIsImage){
-            <div class="diff-image-render diff2up">
-            @if(oldCommitId.isDefined && diff.oldIsImage){
-              <div class="diff-image-frame diff-old"><img src="@url(repository)/blob/@oldCommitId.get/@diff.oldPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
-            } else {
-              @if(diff.changeType != ChangeType.ADD){
-                Not supported
-              }
-            }
-            @if(newCommitId.isDefined && diff.newIsImage){
-              <div class="diff-image-frame diff-new"><img src="@url(repository)/blob/@newCommitId.get/@diff.newPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
-            } else {
-              @if(diff.changeType != ChangeType.DELETE){
-                Not supported
-              }
-            }
-            </div>
         } else {
-          Not supported
-        } } }
+          @if(diff.newContent != None || diff.oldContent != None){
+            <div id="diffText-@i" class="diffText"></div>
+            <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath">@diff.newContent.getOrElse("")</textarea>
+            <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea>
+          } else {
+            @if(diff.newIsImage || diff.oldIsImage){
+              <div class="diff-image-render diff2up">@diff.oldIsImage @diff.newIsImage
+              @if(oldCommitId.isDefined && diff.oldIsImage){
+                <div class="diff-image-frame diff-old"><img src="@url(repository)/blob/@oldCommitId.get/@diff.oldPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
+              } else {
+                @if(diff.changeType != ChangeType.ADD){
+                  <div style="padding: 12px;">Not supported</div>
+                }
+              }
+              @if(newCommitId.isDefined && diff.newIsImage){
+                <div class="diff-image-frame diff-new"><img src="@url(repository)/blob/@newCommitId.get/@diff.newPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
+              } else {
+                @if(diff.changeType != ChangeType.DELETE){
+                  <div style="padding: 12px;">Not supported</div>
+                }
+              }
+              </div>
+            } else {
+              @if(diff.tooLarge){
+                <div style="padding: 12px;">Too large</div>
+              } else {
+                <div style="padding: 12px;">Not supported</div>
+              }
+            }
+          }
+        }
       </td>
     </tr>
   </table>