My Emacs configuration https://git.cjennings.net/dotemacs/atom?h=main 2026-07-02T10:32:16+00:00 2026-07-02T10:32:16+00:00 Craig Jennings c@cjennings.net 2026-07-02T10:32:16+00:00 urn:sha1:8357eed1e4753b142cdda0e57e00260f2341443e Pressing d in the C-x C-s conflict menu (and the save-some loop) now enters a modal review instead of a peek-and-return toggle: point lands on the first hunk, arrows and TAB move through the changes, and the menu keys act from inside the diff. difftastic gets --context 1 and an explicit --width, since as a subprocess it can't detect the terminal and wrapped at 80 columns. A new m choice resolves the conflict in ediff. I kept the post-merge save re-asking once, so an abandoned merge can't silently overwrite the disk version.