eGit bug, trying to resolve "changed but not changed" files

9 files changed, 14 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.compare.match/.checkstyle b/plugins/org.eclipse.emf.compare.match/.checkstyle
index a0ceee23b..71fc3c822 100644
--- a/plugins/org.eclipse.emf.compare.match/.checkstyle
+++ b/plugins/org.eclipse.emf.compare.match/.checkstyle
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="tous" enabled="true" check-config-name="EMF Compare" local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-    <filter name="FilesFromPackage" enabled="true">
-        <filter-data value="src/org/eclipse/emf/compare/match/metamodel"/>
-    </filter>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyleConfiguration.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <local-check-config name="EMF Compare CS5" location="/org.eclipse.emf.compare/codeStyle/EMFCompareCheckstyle5Configuration.xml" type="project" description="Checkstyle 5.0 compatible">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="EMF Compare CS5" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src/org/eclipse/emf/compare/match/metamodel"/>
+  </filter>
 </fileset-config>
diff --git a/plugins/org.eclipse.emf.compare.match/about.html b/plugins/org.eclipse.emf.compare.match/about.html
index 670d10856..670d10856 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/about.html
+++ b/plugins/org.eclipse.emf.compare.match/about.html
diff --git a/plugins/org.eclipse.emf.compare.match/schema/org.eclipse.emf.compare.match.engine.exsd b/plugins/org.eclipse.emf.compare.match/schema/org.eclipse.emf.compare.match.engine.exsd
index 3a69ad615..3a69ad615 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/schema/org.eclipse.emf.compare.match.engine.exsd
+++ b/plugins/org.eclipse.emf.compare.match/schema/org.eclipse.emf.compare.match.engine.exsd
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/EMFCompareMatchMessages.java b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/EMFCompareMatchMessages.java
index 6030bc286..6030bc286 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/EMFCompareMatchMessages.java
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/EMFCompareMatchMessages.java
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/emfcomparematchmessages.properties b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/emfcomparematchmessages.properties
index a4e74ed7f..a4e74ed7f 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/emfcomparematchmessages.properties
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/emfcomparematchmessages.properties
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/engine/IMatchEngine.java b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/engine/IMatchEngine.java
index e9e42ecca..e9e42ecca 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/engine/IMatchEngine.java
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/engine/IMatchEngine.java
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/NameSimilarity.java b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/NameSimilarity.java
index 96ec0dfe1..96ec0dfe1 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/NameSimilarity.java
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/NameSimilarity.java
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/StructureSimilarity.java b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/StructureSimilarity.java
index cebb9da23..cebb9da23 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/StructureSimilarity.java
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/internal/statistic/StructureSimilarity.java
diff --git a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/service/MatchEngineDescriptor.java b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/service/MatchEngineDescriptor.java
index 7970985dc..7970985dc 100755..100644
--- a/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/service/MatchEngineDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.match/src/org/eclipse/emf/compare/match/service/MatchEngineDescriptor.java