- No merge.
- Delete
/etc/passwd.pacnew
- (Optional) Edit
/etc/passwd
to change
root:x:0:0::/root:/bin/bash
to
root:x:0:0::/root:/usr/bin/bash
- Done, no headache
/etc/passwd.pacnew
/etc/passwd
to changeroot:x:0:0::/root:/bin/bash
to
root:x:0:0::/root:/usr/bin/bash