Remove ff-only requirement of merge of immediate into deferred branch

As it'll never succeed. We'll just have to let it have a go at merging normally, and fail if there are any merge issues.
internet2 · Sep 5, 2016 · 1b93872 · 1b93872
1 parent bebdb47
commit 1b93872
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/build.xml b/build.xml
@@ -810,7 +810,6 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="immediate"/>
-            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immedate branch into deferred branch.'"/>
         </exec>