From cb18abf913614f832c6155a832574ab8dc7ab43f Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Wed, 17 Nov 2021 11:17:42 +0800
Subject: update

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

(limited to 'tigrc')

diff --git a/tigrc b/tigrc
index 52a98ec..43893c0 100644
--- a/tigrc
+++ b/tigrc
@@ -255,6 +255,8 @@ bind status d ?>rm %(file)
 bind status D ?>git clean -df
 
 # solve conflict
+bind status M none
+bind status Mo @git checkout --ours -- %(file)
 bind status U ?>git reset --hard
 bind status gc @git clean --force
 bind status Ba @git rebase --abort
-- 
cgit v1.2.3-70-g09d2