From d9686024b86c154a8277ee0063ebcceab1319b1a Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Mon, 28 Sep 2020 11:16:59 +0800
Subject: [PATCH] [feature] add hotkey for confliction merging

---
 nvim/config/init.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nvim/config/init.vim b/nvim/config/init.vim
index aee53b7..8b4d281 100644
--- a/nvim/config/init.vim
+++ b/nvim/config/init.vim
@@ -153,6 +153,10 @@ nnoremap <leader>gp :Gpush<CR>
 nnoremap <leader>gg :Gpull<CR>
 nnoremap <leader>gd :Gdiff<CR>
 nnoremap <leader>gb :Gblame<CR>
+nnoremap <leader>gl :Glog<CR>
+nnoremap <leader>gms :Gvdiffsplit!<CR>
+nnoremap <leader>gmh :diffget //2<CR>
+nnoremap <leader>gml :diffget //3<CR>
 
 " ==== ctrlp configuration ====
 let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard']