From 0eb5bf8117df2ac8be2df78277ed5d1555e2fa0e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 20 Dec 2018 09:46:43 +0000
Subject: [PATCH] Close branch bugfix/incoming_diff_with_merge