From 537692c1e37cf40decbe4a93e6a47b69fae9885d Mon Sep 17 00:00:00 2001
From: rl1987 <rl1987@sdf.lonestar.org>
Date: Wed, 6 Mar 2019 19:55:38 +0200
Subject: [PATCH] Using diff -u in check_for_diffs

---
 scripts/git/post-merge.git-hook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook
index ed0e16279c..31f44f84ab 100755
--- a/scripts/git/post-merge.git-hook
+++ b/scripts/git/post-merge.git-hook
@@ -20,7 +20,7 @@ check_for_diffs() {
                then
                         echo "ATTENTION: $1 hook has changed:"
                         echo "==============================="
-                        diff "$installed" "$latest"
+                        diff -u "$installed" "$latest"
                fi
         fi
 }