Permalink
Browse files

Added merge driver for .dmm files.

  • Loading branch information...
cib cib
cib authored and cib committed Nov 11, 2012
1 parent 4fd9087 commit 79e4bfec2c58797d35f1506f55e4752c397edc36
Showing with 14 additions and 0 deletions.
  1. +1 −0 .gitattributes
  2. +5 −0 .gitconfig
  3. BIN MapPatcher.jar
  4. +8 −0 mapmerge.sh
@@ -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
BIN +9.36 KB MapPatcher.jar
Binary file not shown.
@@ -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

0 comments on commit 79e4bfe

Please sign in to comment.