Go to file
Sanchayan Maity 534eebb89e nvim: Remove mergetool and switch to DiffConflicts for git merge
Also add the conflict-marker plugin. This should also be useful
for doing rebases and resolving conflicts. Might drop one later
if one of them serves all the purposes in all cases.

While at it, add unimpaired style bindings for moving between
tabs. This is required since :DiffConflictsShowHistory opens
a new tab and default tab navigation bindings gt/gT at least
are binded to something else in python.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-03 21:35:28 +05:30
fish/.config/fish fish: Add git aliases 2020-04-03 11:55:08 +05:30
git nvim: Remove mergetool and switch to DiffConflicts for git merge 2020-05-03 21:35:28 +05:30
gnupg/.gnupg Update gnupg and notmuch config 2019-12-31 15:04:16 +05:30
i3/.i3 i3: Fix the keyboard layout and make capslock function as ESC 2020-01-14 12:39:13 +05:30
imapfilter/.imapfilter Update all mail related configs 2020-01-06 10:55:00 +05:30
mbsync Update all mail related configs 2020-01-06 10:55:00 +05:30
msmtp Update all mail related configs 2020-01-06 10:55:00 +05:30
mutt/.mutt mutt: Fix msmtp account settings inside mutt 2020-01-06 18:51:47 +05:30
notmuch Update all mail related configs 2020-01-06 10:55:00 +05:30
nvim nvim: Remove mergetool and switch to DiffConflicts for git merge 2020-05-03 21:35:28 +05:30
offlineimap Individual configs should still be in directories 2019-12-31 14:38:50 +05:30
tmux tmux: Update tmux plugins 2020-03-30 11:00:44 +05:30
.gitignore gitignore: Ignore patch & diff files 2020-01-14 21:53:44 +05:30
.gitmodules tmux: Remove tmux fingers 2020-03-25 19:06:21 +05:30
Makefile Makefile: Do not stow gnupg config 2020-01-03 15:27:01 +05:30