summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
diff options
context:
space:
mode:
Diffstat (limited to 'admin/gitmerge.el')
-rw-r--r--admin/gitmerge.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 0dfd190d753..fa8c9c0f3de 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -67,7 +67,7 @@ re-?generate\\|bump version\\|from trunk\\|Auto-commit"
'((t (:strike-through t)))
"Face for skipped commits.")
-(defconst gitmerge-default-branch "origin/emacs-25"
+(defconst gitmerge-default-branch "origin/emacs-26"
"Default for branch that should be merged.")
(defconst gitmerge-buffer "*gitmerge*"