851 |
the same program in two different directions. To recover from this |
the same program in two different directions. To recover from this |
852 |
confusion, you need to merge the two versions. Emerge makes this |
confusion, you need to merge the two versions. Emerge makes this |
853 |
easier. See also @ref{Comparing Files}, for commands to compare |
easier. See also @ref{Comparing Files}, for commands to compare |
854 |
in a more manual fashion, and @ref{,Ediff,, ediff, The Ediff Manual}. |
in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}. |
855 |
|
|
856 |
@menu |
@menu |
857 |
* Overview of Emerge:: How to start Emerge. Basic concepts. |
* Overview of Emerge:: How to start Emerge. Basic concepts. |