Demo of how to use the built-in `smerge-mode' and/or `ediff' to resolve merge conflicts between different versions of a file. These tools can be accessed via both the standard Version Control framework (VC) and Magit. /// My dotemacs: https://protesilaos.com/dotemacs