Skip to content

GitLab

Switch branch/tag
Find file BlameHistoryPermalink
  • Stefan Monnier's avatar
    Add word-granularity refinement. · cd62539f
    Stefan Monnier authored 
    (smerge-refine-forward-function, smerge-refine-ignore-whitespace)
(smerge-refine-weight-hack): New vars.
(smerge-refine-forward): New fun.
(smerge-refine-chopup-region, smerge-refine-highlight-change): Use them.
(smerge-refine-subst): Use them as well.  Preserve point.
    cd62539f
smerge-mode.el 36.4 KB