Merge
ignore ede files
diff-hl keybindings