From d7234d3a117ce90c1aa826884c966a568449b9de Mon Sep 17 00:00:00 2001
From: IoIxD <ioixd@users.noreply.github.com>
Date: Mon, 20 Oct 2025 22:04:44 +0000
Subject: [PATCH] convience script for merging PRs from the git repo to svn

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@436 b9cfdab3-6d41-4d17-bbe4-086880011989
---
 tools/git_merge.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 tools/git_merge.sh

diff --git a/tools/git_merge.sh b/tools/git_merge.sh
new file mode 100755
index 0000000..2450726
--- /dev/null
+++ b/tools/git_merge.sh
@@ -0,0 +1,7 @@
+if [[ $1 -eq "" ]]; then
+    echo "Blank argument."
+    exit
+fi
+
+echo "Applying PR #$1    (https://github.com/pyrite-dev/milsko/pull/$1.diff)"
+curl https://github.com/pyrite-dev/milsko/pull/$1.diff -L | patch -p1