Code:
--- /etc/portage/._cfg0001_package.accept_keywords 2012-07-14 07:03:09.018589550 -0500
+++ /etc/portage/._mrg0001_package.accept_keywords 1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-=sys-devel/gcc-4.6.2 ~x86
-net-irc/weechat ~x86
-#required by bleachbit (argument)
-=sys-apps/bleachbit-0.9.2 ~x86
>> (1 of 2) -- /etc/portage/package.accept_keywords
>> q quit, h help, n next, e edit-new, z zap-new, u use-new
m merge, t toggle-merge, l look-merge:
> #required by bleachbit (argument)
> =sys-apps/bleachbit-0.9.2 ~x86
%help
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.
%
I just ran dispatch-conf as suggested. I always get confused here. Most of the time, I'll find a way to write out both files and then vimdiff them. I'd like to use vimdiff, but because of some reason, vimdiff can't be used instead according to the gentoo handbook. All I want to do is append the lines from the new file to the existing one.
