mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-21 12:14:37 +07:00
IDEA-78992 Columns in "Files Merged with Conflicts" have improper widths
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user