Skip to main content
1 vote
Accepted

Automatically merge files

EDIT in response to your comment Seems like indeed configuring the smerge-begin-re, smerge-lower-re, and smerge-end-re as follows before you activate smerge-mode (setq-local smerge-begin-re "^#...
dalanicolai's user avatar
  • 7,865

Only top scored, non community-wiki answers of a minimum length are eligible