Emacs can highlight git merge conflicts in buffer 2022-05-30 Emacs can highlight git merge conflicts in buffer #Tech