|
发表于 2006-5-22 09:33:51
|
显示全部楼层
mergemaster工具会生成一份系统(通常指make world后的系统)默认的配置文件(通常是/etc目录下),并跟原来系统的配置文件相比较,让管理员决定配置文件去或留或按需要merge.Use 'd' to delete the temporary ./etc/hosts
Use 'i' to install the temporary ./etc/hosts
Use 'm' to merge the temporary and installed versions
Use 'v' to view the diff results again |
|