call merge tool properly

[xonotic/div0-gittools.git] / git-update-octopus

diff --git a/git-update-octopus b/git-update-octopus
index 50217f26d2bb18f73563c20f109a3783dda0e6b9..395df0bb1aab6549e72620abf4f2b5a9f45e8355 100755 (executable)
--- a/git-update-octopus
+++ b/git-update-octopus
@@ -2,7 +2,7 @@
 
 git log --format=raw | while IFS= read -r L; do
        case "$L" in
-               '    Merge branches '*)
+               '    Merge branches '*|'    Merge remote branches '*)
                        b=`echo "$L" | sed -e "s/[^']*'\?\([^']*\)'\?/\1 /g"`
                        git merge $b
                        break