From 960f6951157a82be962c639f8f2f6f13bc90fc7a Mon Sep 17 00:00:00 2001
From: Reonu <danileon95@gmail.com>
Date: Tue, 27 Apr 2021 11:54:02 +0100
Subject: [PATCH] uncringed the patching behaviour

---
 tools/apply_patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/apply_patch.sh b/tools/apply_patch.sh
index 1ab8ed23..31ddfc3a 100755
--- a/tools/apply_patch.sh
+++ b/tools/apply_patch.sh
@@ -13,7 +13,7 @@ fi
 read -p "Do you wish to apply the patch '$1'? [Y/N] " response
 case "$response" in
     Y|y)
-	patch -p1 < "$1"
+	patch -p1 --merge < "$1"
 	;;
     N|n)
 	echo 'Quit'