From fdc511572823f64ef3c1bffe25bd3a88787d5d6a Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Thu, 21 Jan 2016 01:55:37 -0500
Subject: Replace obsolete magit-get-tracked-branch

---
 lisp/km-magit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp')

diff --git a/lisp/km-magit.el b/lisp/km-magit.el
index 1dba7bd..6c4ed39 100644
--- a/lisp/km-magit.el
+++ b/lisp/km-magit.el
@@ -88,7 +88,7 @@ branch."
   "Perform fast-forward merge of upstream branch.
 \n(git merge --no-edit --ff-only <upstream>)"
   (interactive)
-  (--if-let (magit-get-tracked-branch)
+  (--if-let (magit-get-upstream-branch)
       (magit-merge it '("--ff-only"))
     (user-error "No upstream branch")))
 
-- 
cgit v1.2.3