commit be7ed72da1af12f52b93d7b45ee49361fd90bb68
author Michael Ochmann <michael.ochmann@sap.com> Mon Apr 07 13:23:37 2014 +0200
committer Michael Ochmann <michael.ochmann@sap.com> Tue Apr 15 11:41:57 2014 +0200
tree 01f2f98fdab1068adf882e5ad9de1a2bace1740b
parent 5636dc0beb1b973d1f6def37795132ed34bf2c32

Added --use-content-merge option to new Gerrit projects

Change-Id: Ia9d8ade164af58d68db354ffeacad280269b599b
Signed-off-by: Michael Ochmann <michael.ochmann@sap.com>

org.eclipse.skalli.gerrit/src/main/java/org/eclipse/skalli/gerrit/client/internal/GerritClientImpl.java

diff --git a/org.eclipse.skalli.gerrit/src/main/java/org/eclipse/skalli/gerrit/client/internal/GerritClientImpl.java b/org.eclipse.skalli.gerrit/src/main/java/org/eclipse/skalli/gerrit/client/internal/GerritClientImpl.java
index c44fe3b..6433cbd 100644
--- a/org.eclipse.skalli.gerrit/src/main/java/org/eclipse/skalli/gerrit/client/internal/GerritClientImpl.java
+++ b/org.eclipse.skalli.gerrit/src/main/java/org/eclipse/skalli/gerrit/client/internal/GerritClientImpl.java
@@ -191,6 +191,7 @@
         appendArgument(sb, "use-contributor-agreements", useContributorAgreements);
         appendArgument(sb, "use-signed-off-by", useSignedOffBy);
         appendArgument(sb, "require-change-id", true);
+        appendArgument(sb, "use-content-merge", true);
 
         // available since 2.1.6-rc1 & needed so that Hudson does not struggle with empty projects.
         appendArgument(sb, "empty-commit", emptyCommit);