From 79e4bfec2c58797d35f1506f55e4752c397edc36 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 01:02:19 +0100 Subject: [PATCH] Added merge driver for .dmm files. --- .gitattributes | 1 + .gitconfig | 5 +++++ MapPatcher.jar | Bin 0 -> 9589 bytes mapmerge.sh | 8 ++++++++ 4 files changed, 14 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitconfig create mode 100755 MapPatcher.jar create mode 100755 mapmerge.sh diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..8a313292bb --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.dmm merge=merge-dmm diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..de5ff6f254 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,5 @@ +[merge "merge-dmm"] + name = mapmerge driver + driver = ./mapmerge.sh %O %A %B + recursive = text + diff --git a/MapPatcher.jar b/MapPatcher.jar new file mode 100755 index 0000000000000000000000000000000000000000..18d5b8f37505ea29884fc5dcb25d77d2752e84b0 GIT binary patch literal 9589 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 /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