Petur Subev
Results
1
issues of
Petur Subev
I use the following in my `.gitconfig` [more info here](https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git) ``` [merge] conflictstyle = diff3 ``` This causes the commands: ``` nnoremap g1 (coc-git-keepcurrent) nnoremap g2 (coc-git-keepboth) nnoremap g3 (coc-git-keepincoming)...