Changes necessary for JDime wrapper script

To retrieve the information about the number of conflicts, a merge now returns the number of conflicted files instead of a Status object.

src/de/uni_passau/fim/gitwrapper/DefaultMergeStrategy.java

 package de.uni_passau.fim.gitwrapper;
 
-import java.util.Optional;
-
 import de.uni_passau.fim.processexecutor.ProcessExecutor;
 
+import java.util.Optional;
+
 /**
  * A {@link MergeStrategy} representing the default 'git merge' merge implementation.
  */
@@ -23,9 +23,9 @@ public class DefaultMergeStrategy implements MergeStrategy {
     }
 
     @Override
-    public Optional<Status> merge(Reference left, Reference right) {
+    public Optional<Integer> merge(Reference left, Reference right) {
         Optional<ProcessExecutor.ExecRes> mergeBase = repo.getGit().exec(repo.getDir(), "merge", "-n", "-q", right.getId());
-        return mergeBase.flatMap(res -> repo.getStatus());
+        return mergeBase.flatMap(res -> repo.getStatus().map(stat -> stat.unmerged.size()));
     }
 
     @Override