From 9fb3b6f922440eef194ebf02a54cfb0dd65f4b2e Mon Sep 17 00:00:00 2001 From: Thomas Bonfort Date: Wed, 4 Apr 2012 13:57:07 +0200 Subject: [PATCH] fix again --- stablemerge.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/stablemerge.sh b/stablemerge.sh index 4f007b62bb..9dd107a36d 100644 --- 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