GNU Emacs Manual. Node: Emerge
20.14: Merging Files with Emerge
It's not unusual for programmers to get their signals crossed and modify
the same program in two different directions. To recover from this
confusion, you need to merge the two versions. Emerge makes this
easier. See also Comparing Files, for commands to compare
in a more manual fashion, and Emerge.