Fix conflicts to update to latest Bukkit, yay fluff.

By: md_5 <md_5@live.com.au>
2013-01-20 14:52:20 +11:00
parent 7654578ddc
commit 353ba3e15b
5 changed files with 25 additions and 25 deletions
--- a/rebuildPatches.sh
+++ b/rebuildPatches.sh
@@ -16,7 +16,7 @@ function savePatches {
    what=$1
    target=$2
    cd $basedir/$target/
-    git format-patch -N -o $basedir/${what}-Patches/ upstream/master
+    git format-patch -N -o $basedir/${what}-Patches/ upstream/upstream
    cd $basedir
    git add $basedir/${what}-Patches
    cleanupPatches $basedir/${what}-Patches