VCS: shelved changes: navigatable show diff: allow conflicting changes to be shown...
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 2 Feb 2010 11:29:45 +0000 (14:29 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 2 Feb 2010 11:29:45 +0000 (14:29 +0300)
commite25c9f4b686c603239bf99154e41c6da52100f69
treec130c063bc3cc7f64fa64c4e428c793c737716fb
parent8a4139295b77634e5b614627360740b98ada4261
VCS: shelved changes: navigatable show diff: allow conflicting changes to be shown, warn about missing bases
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/FilePatchInProgress.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/MergedDiffRequestPresentable.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java