MergeDialogCustomizer to customize titles and messages in the MultipleFileMergeDialog.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 10:25:18 +0000 (13:25 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 10:25:18 +0000 (13:25 +0300)
commit7c6249e890341ee89e36e6ec7521a073301d9a4d
treec7e5689916ff54f20684aa0bc1aa3ac9ac64222a
parente8adc64f09be50edb0513b0d2eadbb67896851eb
MergeDialogCustomizer to customize titles and messages in the MultipleFileMergeDialog.

1. MergeDialogCustomizer to define description shown in the MultipleFileMergeDialog and titles above columns in the 3-way merge tool.
2. AbstractVcsHelper.showMergeDialog receive a MergeDialogCustomizer.
3. Define the customizer while unstashing during update.
4. Fix swapped local/server columns in the merge tool when unstashing during update.
platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java
plugins/git4idea/src/git4idea/merge/GitMergeConflictResolver.java
plugins/git4idea/src/git4idea/update/GitStashChangesSaver.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java