From fdd222464eaec7ee4acbfff7fd66f9d76dc64e36 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 3 Dec 2015 12:19:53 +0300
Subject: [PATCH] diff: do force line numbers in editor

this setting is managed by SetEditorSettingsAction. If it isn't, let's keep the defaults.
---
 platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
index 172590eb071d..bb845cbb4142 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
@@ -172,7 +172,6 @@ public class DiffUtil {
 
     editor.putUserData(DiffManagerImpl.EDITOR_IS_DIFF_KEY, Boolean.TRUE);
 
-    editor.getSettings().setLineNumbersShown(true);
     editor.getSettings().setShowIntentionBulb(false);
     ((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(true);
     editor.getGutterComponentEx().setShowDefaultGutterPopup(false);