From b4d6eb9a232dab48ce658470a980e7a15edb500f Mon Sep 17 00:00:00 2001
From: thibthib18 <37300147+thibthib18@users.noreply.github.com>
Date: Fri, 10 Sep 2021 08:50:58 +0200
Subject: feat: git merge branch action (#1220)

---
 lua/telescope/builtin/init.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lua/telescope/builtin/init.lua')

diff --git a/lua/telescope/builtin/init.lua b/lua/telescope/builtin/init.lua
index a3ea4c6..e790700 100644
--- a/lua/telescope/builtin/init.lua
+++ b/lua/telescope/builtin/init.lua
@@ -186,6 +186,7 @@ builtin.git_bcommits = require_on_exported_call("telescope.builtin.git").bcommit
 ---   - `<C-r>`: rebases currently selected branch
 ---   - `<C-a>`: creates a new branch, with confirmation prompt before creation
 ---   - `<C-d>`: deletes the currently selected branch, with confirmation prompt before deletion
+---   - `<C-y>`: merges the currently selected branch, with confirmation prompt before deletion
 ---@param opts table: options to pass to the picker
 builtin.git_branches = require_on_exported_call("telescope.builtin.git").branches
 
-- 
cgit v1.2.3