From a5ed01ace9c71e256e9a9efeb737a051ac90f69e Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 4 Aug 2010 21:33:55 +0200
Subject: [PATCH 1/1] fix name typo

---
 all | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/all b/all
index b4f38b88..6afd6dff 100755
--- 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
-- 
2.39.2