add DX3 headers

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b4f38b8849dfba794ab5bfdf8bb6cae663aae3c5..6afd6dff9de8ef33a0113815cff93fa33e521b11 100755 (executable)
--- a/all
+++ b/all
@@ -256,7 +256,7 @@ case "$cmd" in
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
                                                if ! verbose git pull; then
-                                                       fix_upstream_rebase_mergefailed || true
+                                                       fix_upstream_rebase_mergefail || true
                                                        check_mergeconflict "$d"
                                                        echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
                                                        read -r DUMMY