Tux's lil' helper
Joined: 19 Feb 2011
Location: Teika rhymes w/ "Stay blur", not ψ̄
|Posted: Thu Jul 26, 2012 11:54 am Post subject: Tip: Another nice merge tool for dispatch-conf: "git ad
|Hi. dispatch-conf has the option "merge" which lets you edit the diff. "git add -p" is a nice tool for that, even if you've never used git; the usage is easy, or completely self-explanatory. For a howto, go to the page dispatch-conf in the old gentoo wiki
You can test it by making two similar files /etc/foo and /etc/._cfg0000_foo.
# I confess that I've been using the ugly obsolete painful default, "sdiff" (It is quite difficult to understand, and learning such outdated tool is a complete waste of your life.) although I've been using Gentoo for 7 years. (Well, for the first 3 years or so it was etc-update.) Ouch.
Easy Shift / Ctrl / AltGr ... hack; save your pinkies, type without drudgery: topic 865313
Trouble upgrading Perl? See topic 1058924.