Cleaner conflict resolution

Fix stopinsert

try to fix stopinsert/autowrite again

regexp match "no jump on load" filetypes

Port encrypted file edit to lua

Add neodev.nvim

(0) -1000 -300 -100 -30 -10 -6 +6 +10 +30 tip

mercurial