Attempting to automatically merge changes in files... done.
The following file could not be merged automatically: /etc/passwd
Press Enter to edit this file in vi and resolve the conflicts
manually...
how do i resolve this in vi ?
I use bash and who is Charlie?
The following file could not be merged automatically: /etc/passwd
Press Enter to edit this file in vi and resolve the conflicts
manually...
how do i resolve this in vi ?
Code:
<<<<<<< current version
# $FreeBSD$
#
root:*:0:0:Charlie &:/root:/usr/local/bin/bash
=======
root:*:0:0:Charlie &:/root:/bin/csh
>>>>>>> 13.2-RELEASE
toor:*:0:0:Bourne-again Superuser:/root:
daemon:*:1:1:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5:System &:/:/usr/sbin/nologin
bin:*:3:7:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533:KMem Sandbox:/:/usr/sbin/nologin
games:*:7:13:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8:News Subsystem:/:/usr/sbin/nologin
man:*:9:9:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
_pflogd:*:64:64:pflogd privsep user:/var/empty:/usr/sbin/nologin
/var/db/freebsd-update/merge/new//etc/passwd: unmodified: line 1
Code:
root:*:0:0:Charlie &:/root:/usr/local/bin/bash
=======
root:*:0:0:Charlie &:/root:/bin/csh