Merge branch 'branch-5-2' into branch-5-4

MapServer · Apr 4, 2012 · 3ee6f5a · 3ee6f5a
2 parents b683965 + ed8a64b
commit 3ee6f5a
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/stablemerge.sh b/stablemerge.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+git checkout branch-5-0
+if $?; then exit; fi
+git merge branch-4-10
+if $?; then exit; fi
+git checkout branch-5-2
+if $?; then exit; fi
+git merge branch-5-0
+if $?; then exit; fi
+git checkout branch-5-4
+if $?; then exit; fi
+git merge branch-5-2
+if $?; then exit; fi
+git checkout branch-5-6
+if $?; then exit; fi
+git merge branch-5-4
+if $?; then exit; fi
+git checkout branch-6-0
+if $?; then exit; fi
+git merge branch-5-6
+if $?; then exit; fi
+git checkout master
+if $?; then exit; fi
+git merge branch-6-0