IDEA-78992 Columns in "Files Merged with Conflicts" have improper widths

This commit is contained in:
Evgeny Zakrevsky
2012-01-13 18:50:17 +04:00
parent 1d2514b11c
commit a89c088fc3
@@ -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;
}
}
}
}