No description

Sanchayan Maity d8fc9facec nvim/git: Use vimdiff as merge tool & drop DiffConflicts ... The conflict markers plugin is what we have been using all the time and is useful even without resorting to merge tool. Drop the DiffConflicts plugin and use vimdiff as the merge tool if at all we need to resort to a full 3 way merge view. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>		2020-09-17 10:48:11 +05:30
fish/.config/fish	fish: config: Enable fzf key bindings	2020-07-02 14:39:54 +05:30
git	nvim/git: Use vimdiff as merge tool & drop DiffConflicts	2020-09-17 10:48:11 +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	Switch to asymptotic	2020-07-23 20:20:48 +05:30
mbsync	Switch to asymptotic	2020-07-23 20:20:48 +05:30
msmtp	Switch to asymptotic	2020-07-23 20:20:48 +05:30
mutt/.mutt	mutt: asymptotic: Fix set from	2020-07-30 16:29:42 +05:30
notmuch	Switch to asymptotic	2020-07-23 20:20:48 +05:30
nvim	nvim/git: Use vimdiff as merge tool & drop DiffConflicts	2020-09-17 10:48:11 +05:30
offlineimap	Individual configs should still be in directories	2019-12-31 14:38:50 +05:30
tmux	tmux: Update tmux plugins	2020-07-11 10:55:54 +05:30
.gitignore	gitignore: Ignore patch & diff files	2020-01-14 21:53:44 +05:30
.gitmodules	tmux: Add extrakto tmux plugin	2020-06-12 10:19:30 +05:30
Makefile	Makefile: Do not stow gnupg config	2020-01-03 15:27:01 +05:30