I love that Emacs notices merge conflicts in Bazaar versioned files,
highlighting the differences in green and pink. It's a small thing, but I really
miss this automation for when working with Git — I have to manually type M-x
smerge-mode
.
The feature works by looking for conflict files and markers …
read more