MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-168838 vcs: preview diff not refreshed on merge conflict resolve

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-05-04 20:37:59 +03:00
parent db2a341ef0
commit a602286a35
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java
+1
View File
@@ -107,6 +107,7 @@ public class ChangeDiffRequestProducer implements DiffRequestProducer {
}
if (!Comparing.equal(change1.getClass(), change2.getClass())) return false;
if (!Comparing.equal(change1.getFileStatus(), change2.getFileStatus())) return false;
if (!isEquals(change1.getBeforeRevision(), change2.getBeforeRevision())) return false;
if (!isEquals(change1.getAfterRevision(), change2.getAfterRevision())) return false;