From a3781fedc0a05d38521ee1b2e73f4c10a7731061 Mon Sep 17 00:00:00 2001
From: martind2000 <martind2000@gmail.com>
Date: Fri, 19 Feb 2016 23:18:29 +0000
Subject: [PATCH] WS-11.0.3 <marti@DESKTOP-ITST4MB Update diff.xml	Create
 IntelliLang.xml

---
 IntelliLang.xml |  9 +++++++
 diff.xml        | 65 ++++++++++++++++++++++++++-----------------------
 2 files changed, 43 insertions(+), 31 deletions(-)
 create mode 100644 IntelliLang.xml

diff --git a/IntelliLang.xml b/IntelliLang.xml
new file mode 100644
index 0000000..621d5ba
--- /dev/null
+++ b/IntelliLang.xml
@@ -0,0 +1,9 @@
+<application>
+  <component name="LanguageInjectionConfiguration">
+    <option name="INSTRUMENTATION" value="ASSERT" />
+    <option name="LANGUAGE_ANNOTATION" value="org.intellij.lang.annotations.Language" />
+    <option name="PATTERN_ANNOTATION" value="org.intellij.lang.annotations.Pattern" />
+    <option name="SUBST_ANNOTATION" value="org.intellij.lang.annotations.Subst" />
+    <option name="RESOLVE_REFERENCES" value="true" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/diff.xml b/diff.xml
index 9f2ad10..1331e6f 100644
--- a/diff.xml
+++ b/diff.xml
@@ -1,32 +1,35 @@
-<application>
-  <component name="DiffSettings">
-    <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings />
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings />
-      </entry>
-      <entry key="Default">
-        <PlaceSettings />
-      </entry>
-    </option>
-  </component>
-  <component name="TextDiffSettings">
-    <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
-      <entry key="Default">
-        <PlaceSettings />
-      </entry>
-    </option>
-  </component>
+<application>
+  <component name="DiffSettings">
+    <option name="PLACES_MAP">
+      <entry key="ChangesView">
+        <PlaceSettings />
+      </entry>
+      <entry key="CommitDialog">
+        <PlaceSettings />
+      </entry>
+      <entry key="Default">
+        <PlaceSettings />
+      </entry>
+    </option>
+  </component>
+  <component name="TextDiffSettings">
+    <option name="PLACES_MAP">
+      <entry key="ChangesView">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="CommitDialog">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="Default">
+        <PlaceSettings />
+      </entry>
+      <entry key="Merge">
+        <PlaceSettings />
+      </entry>
+    </option>
+  </component>
 </application>
\ No newline at end of file