Merge branch 'master' into multiroot_branch
[idea/community.git] / plugins / git4idea / src / git4idea / merge / GitMergeProvider.java
index 224a6c438ad43318707ee58017d01b1e01c1c70d..3b18a93055023782d33027f7f59e0773af9d7882 100644 (file)
@@ -387,6 +387,16 @@ public class GitMergeProvider implements MergeProvider2 {
             throw new IllegalStateException("Unknown status " + s + " for file " + file.getPath());
         }
       }
+
+      @Override
+      public String getMaxStringValue() {
+        return GitBundle.message("merge.tool.column.status.modified");
+      }
+
+      @Override
+      public int getAdditionalWidth() {
+        return 10;
+      }
     }
   }
 }