search

UndeadKernel / pacfiles-mode

Emacs major mode to manage pacnew and pacsave files left by the pacman Arch tool
MIT License
42 stars 2 forks source link

Support smerge #1

Open dakra opened 6 years ago

dakra commented 6 years ago

I like smerge better than ediff as it's easier and most of the time enough. Magit has smerge as default as well.

UndeadKernel commented 6 years ago

I'm not familiar with smerge but it might be a simple feature to implement. I'll try to experiment with it to see how it works. Ediff is a monsert, but once you learn to use it (and understand it's delicate feelings) it's powerful.