androsI am happy to announce that conflict-buttons.el is on MELPA
https://git.andros.dev/andros/conflict-buttons.el
#emacs #git
https://git.andros.dev/andros/conflict-buttons.el
#emacs #git
Omar Antolín@andros Conflict-buttons sounds like the name of a particularly ornery cat.