From f619162e577d1b373f28290c7f6cf5ba5c65d3d7 Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Fri, 2 Oct 2020 22:24:42 +0100
Subject: Avoid commit edit prompt when merging

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a62b086c8..192161387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ before_install:
     if [ $TRAVIS_BRANCH == "nightly"]; then
       git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
       git fetch
-      git merge --no-ff origin/develop
+      git merge --no-ff --commit --no-edit origin/develop
     fi
 install:
   - cd recipes && npm install && npm run package && cd ..
-- 
cgit v1.2.3-70-g09d2