Next: eMerge, Previous: eDiff Mode, Up: Comparing-Diffing-Merging [Index]
smerge-mode is a minor mode to simplify editing output from the diff3
program. This is typically the result of a failed merge from a version control
system update outside VC, due to conflicting changes to a file. Smerge mode
provides commands to resolve conflicts by selecting specific changes.