Merge branch 'branch-5-4' into branch-5-6

MapServer · Aug 31, 2012 · b3dbd80 · b3dbd80
2 parents 27306bf + a787f03
commit b3dbd80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/stablemerge.sh b/stablemerge.sh
@@ -20,6 +20,10 @@ git checkout branch-6-0
 if test $? -ne 0; then exit; fi
 git merge branch-5-6
 if test $? -ne 0; then exit; fi
-git checkout master
+git checkout branch-6-2
 if test $? -ne 0; then exit; fi
 git merge branch-6-0
+if test $? -ne 0; then exit; fi
+git checkout master
+if test $? -ne 0; then exit; fi
+git merge branch-6-2