Add test for "real" merge commits

scm-test/src/main/java/sonia/scm/repository/client/api/MergeCommandBuilder.java

@@ -35,13 +35,28 @@ import java.io.IOException;
 public final class MergeCommandBuilder {
 
   private final MergeCommand command;
+  private final MergeRequest request = new MergeRequest();
 
   MergeCommandBuilder(MergeCommand command) {
     this.command = command;
   }
 
+  public MergeCommandBuilder ffOnly() {
+    request.setFfMode(MergeRequest.FastForwardMode.FF_ONLY);
+    return this;
+  }
+
+  public MergeCommandBuilder noFf() {
+    request.setFfMode(MergeRequest.FastForwardMode.NO_FF);
+    return this;
+  }
+
+  public MergeCommandBuilder ffIfPossible() {
+    request.setFfMode(MergeRequest.FastForwardMode.FF);
+    return this;
+  }
+
   public void merge(String branch) throws IOException {
-    MergeRequest request = new MergeRequest();
     request.setBranch(branch);
     command.merge(request);
   }

scm-test/src/main/java/sonia/scm/repository/client/spi/MergeRequest.java

@@ -34,6 +34,7 @@ public final class MergeRequest {
 
   private String branch;
   private String message;
+  private FastForwardMode ffMode = FastForwardMode.FF;
 
   @Override
   public boolean equals(Object obj) {
@@ -79,6 +80,10 @@ public final class MergeRequest {
     this.message = message;
   }
 
+  public void setFfMode(FastForwardMode ffMode) {
+    this.ffMode = ffMode;
+  }
+
   String getBranch() {
     return branch;
   }
@@ -86,4 +91,12 @@ public final class MergeRequest {
   String getMessage() {
     return message;
   }
+
+  public FastForwardMode getFfMode() {
+    return ffMode;
+  }
+
+  public enum FastForwardMode {
+    FF_ONLY, FF, NO_FF
+  }
 }