Copyright (C) 2000-2012 |
GNU Info (emacs)EmergeMerging 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 Note: Comparing Files, for commands to compare in a more manual fashion, and Note: Ediff.
automatically generated by info2www version 1.2.2.9 |