It happens that when merging, git calls out an interactive $EDITOR and waits for user input. This causes SparkleShare to block as well. Signed-off-by: Maxime “pep” Buquet <pep@collabora.com>