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

copy to should be the first option after merge

Browse Source
This commit is contained in:
Konstantin Bulenkov
2013-03-08 10:40:16 +01:00
parent 8ac3b416f9
commit 79340453f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java
+1 -1
View File
@@ -214,7 +214,7 @@ public class DirDiffElementImpl implements DirDiffElement {
} else if (myType == DiffType.TARGET) {
myOperation = op == COPY_FROM ? DELETE : op == DELETE ? NONE : COPY_FROM;
} else if (myType == DiffType.CHANGED) {
myOperation = op == MERGE ? COPY_FROM : op == COPY_FROM ? COPY_TO : MERGE;
myOperation = op == MERGE ? COPY_TO : op == COPY_TO ? COPY_FROM : MERGE;
}
}