Mergemaster


 * Upgrade/source

Смотри и решаем.
 * Удалить новый файл клавишей d

m и увидеть % и после Enter

ed:    Edit then use both versions, each decorated with a header. eb:    Edit then use both versions. el or e1:      Edit then use the left version. er or e2:      Edit then use the right version. e:     Discard both versions then edit a new one. l or 1: Use the left version. r or 2: Use the right version. s:     Silently include common lines. v:     Verbosely include common lines. q:     Quit.

Руками добавил строчку +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin


 * Comparison complete

/var/tmp/temproot/etc/master.passwd
 * Files that remain for you to merge by hand:

Use 'd' to delete the temporary ./etc/group Use 'i' to install the temporary ./etc/group Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again

mergemaster -p

*** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot
 * Creating the temporary root environment in /var/tmp/temproot


 * Beginning comparison

======================================================================

*** Displaying differences between ./etc/group and installed version:

--- /etc/group 2011-03-02 10:39:36.000000000 +0000 +++ ./etc/group 2011-03-28 17:41:10.000000000 +0000 @@ -1,4 +1,4 @@ -# $FreeBSD: releng/8.2/etc/group 170566 2007-06-11 18:36:39Z ceri $ +# $FreeBSD: src/etc/group,v 1.35.10.2 2011/03/28 17:41:10 trociny Exp $ # wheel:*:0:root daemon:*:1: @@ -27,5 +27,6 @@ network:*:69: audit:*:77: www:*:80: +hast:*:845: nogroup:*:65533: nobody:*:65534:

Use 'd' to delete the temporary ./etc/group Use 'i' to install the temporary ./etc/group Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again

Default is to leave the temporary file to deal with by hand

How should I deal with this? [Leave it for later]