Merge pull request #1915 from CIB/master

Added merge driver
2026-08-29 15:08:02 +01:00 · 2012-11-11 08:03:03 -08:00
parent 1070e925ab 610860bfab
commit f6952ea0a8
6 changed files with 19 additions and 0 deletions
@@ -0,0 +1 @@
+*.dmm merge=merge-dmm
@@ -0,0 +1,5 @@
+[merge "merge-dmm"]
+    name = mapmerge driver
+    driver = ./mapmerge.sh %O %A %B
+    recursive = text
+
@@ -0,0 +1,2 @@
+java -jar MapPatcher.jar -clean ../maps/tgstation.2.0.9.1.dmm.backup ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm
+del ../maps/tgstation.2.0.9.1.dmm.backup
@@ -0,0 +1,9 @@
+java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2
+if [ "$?" -gt 0 ]
+then
+    echo "Unable to automatically resolve map conflicts, please merge manually."
+    exit 1
+fi
+java -jar maptools/MapPatcher.jar -clean $1 $2 $2
+
+exit 0
@@ -0,0 +1,2 @@
+cd ../maps
+copy tgstation.2.0.9.1.dmm tgstation.2.0.9.1.dmm.backup