From 6a08f3183c8abd755ca3779100ad3539d9102f5c Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 27 Jul 2012 17:24:06 +0400 Subject: [PATCH] merge text conflict: better file paths presentation in a dialog --- .../intellij/openapi/vcs/merge/MultipleFileMergeDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java index ff4c188b847c..838a96b3d174 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java @@ -356,7 +356,11 @@ public class MultipleFileMergeDialog extends DialogWrapper { protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) { VirtualFile vf = (VirtualFile)value; setIcon(VirtualFilePresentation.getIcon(vf)); - append(FileUtil.toSystemDependentName(vf.getPresentableUrl()), SimpleTextAttributes.REGULAR_ATTRIBUTES); + append(vf.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); + final VirtualFile parent = vf.getParent(); + if (parent != null) { + append(" (" + FileUtil.toSystemDependentName(parent.getPresentableUrl()) + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES); + } } } }