diff options
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java')
-rw-r--r-- | platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java index 6b4a3fb2c390..f7fbe4c9980d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java @@ -325,7 +325,7 @@ public class ApplyPatchAction extends DumbAwareAction { MergeRequest request; if (myReadOnly) { request = DiffRequestFactory.getInstance() - .create3WayDiffRequest(leftText, rightText, originalContent, project, null, null); + .create3WayDiffRequest(leftText, rightText, originalContent, file.getFileType(), project, null, null); } else { request = DiffRequestFactory.getInstance().createMergeRequest(reverse ? rightText : leftText, reverse ? leftText : rightText, originalContent, |