From 79340453f864ea792f3b5685e5ad5db079efe7c1 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 8 Mar 2013 10:40:16 +0100
Subject: [PATCH] copy to should be the first option after merge

---
 .../com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java
index fa514f79e036..5cf102f6c260 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElementImpl.java
@@ -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;
     }
   }