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

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