cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added merge driver for .dmm files.

Browse Source
This commit is contained in:
cib
2012-11-11 01:02:19 +01:00
parent 4fd90875bc
commit 79e4bfec2c
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
*.dmm merge=merge-dmm

5
.gitconfig Normal file
View File

@@ -0,0 +1,5 @@
[merge "merge-dmm"]
name = mapmerge driver
driver = ./mapmerge.sh %O %A %B
recursive = text

BIN
MapPatcher.jar Executable file
View File

Binary file not shown.

8
mapmerge.sh Executable file
View File

@@ -0,0 +1,8 @@
java -jar MapPatcher.jar -unpack $1 $1 > /dev/null
java -jar MapPatcher.jar -unpack $2 $2 > /dev/null
java -jar MapPatcher.jar -unpack $3 $3 > /dev/null
cp $2 original.dmm
echo "Map merge conflict, make sure to repack the map with MapPatcher -pack and clean it with MapPatcher -clean original.dmm"
exit 0