1 files changed, 6 insertions, 5 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/MergeApplication.java b/platform/platform-impl/src/com/intellij/openapi/diff/MergeApplication.java
index 0c088929ea49..d1d6cf6cb9f5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/MergeApplication.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/MergeApplication.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.diff;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Konstantin Bulenkov
@@ -34,11 +35,11 @@ public class MergeApplication extends ApplicationStarterBase {
   }
 
   @Override
-  protected void processCommand(String[] args) throws Exception {
-    final VirtualFile left = findFile(args[1]);
-    final VirtualFile right = findFile(args[2]);
-    final VirtualFile middle = findFile(args[3]);
-    final VirtualFile result = findOrCreateFile(args.length == 4 ? args[3] : args[4]);
+  protected void processCommand(String[] args, @Nullable String currentDirectory) throws Exception {
+    final VirtualFile left = findFile(args[1], currentDirectory);
+    final VirtualFile right = findFile(args[2], currentDirectory);
+    final VirtualFile middle = findFile(args[3], currentDirectory);
+    final VirtualFile result = findOrCreateFile(args.length == 4 ? args[3] : args[4], currentDirectory);
 
     MergeRequest request = DiffRequestFactory.getInstance()
       .createMergeRequest(getText(left), getText(right), getText(middle), result,