From 76ec5b54cf5eea12900a61f925c035e17dbec152 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Mon, 23 Mar 2020 09:50:02 +0800
Subject: update

---
 tigrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tigrc b/tigrc
index 70d1234..adfc5e6 100644
--- a/tigrc
+++ b/tigrc
@@ -248,6 +248,8 @@ bind status U ?>git reset --hard
 bind status gc @git clean --force
 bind status Ba @git rebase --abort
 bind status Bc @git rebase --continue
+bind status Ma @git merge --abort
+bind status Mc @git merge --continue
 bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\""
 
 # apply patch file
-- 
cgit v1.2.3-70-g09d2