From d84877a9f4710a629d9ecb62af8d6e8b9b90ad5b Mon Sep 17 00:00:00 2001
From: Benedikt schesch <b.schesch@gmail.com>
Date: Mon, 25 Sep 2023 23:00:04 -0700
Subject: [PATCH] Further fix style

---
 src/scripts/merge_tools/gitmerge_recursive_histogram.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
index afddba1160..3d8238775a 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
@@ -7,7 +7,6 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s recursive -Xdiff-algorithm=histogram"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
-if [ $? -ne 0 ] ; then
+if ! "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
   exit 1
 fi