On Mon, Jun 25, 2012 at 7:00 AM, Arno Gaboury <arnaud.gaboury@xxxxxxxxx> wrote: > On 06/25/2012 06:55 AM, gt wrote: > I couldn't find any doc about pacdiff. > I manually merged all my pacnew files using oldschool diff and a text > editor. Not very conveniant, but it did the job. > Now playing finally with Vimdiff, as there is a lot of good doc. Even if I > am lost with all these keyboard commands, I like the dual screen interface, > and think I will stick to it. I will maybe add an entry in the *Pacnew and > Pacsave* *files*, as I think a list of most used shortcuts could be > explained. > > TY for all your advices. Dear Arno, It's good that you find your way of dealing with pacnew files. Please take a look at the wiki page https://wiki.archlinux.org/index.php/Pacnew_and_Pacsave_Files And the forum link posted at the end of the wiki. Another helpful tool is pacmatic (https://wiki.archlinux.org/index.php/Pacmatic#Consider_Using_Pacmatic) It automatically informs you if pacman created any pacnew files that you have to deal with. A command like the: locate -e --regex "\.pac(new|orig|save)$" will help you find any pacnew files you have on your system, I usually use this in case I left over some when I did the merge and didn't delete the file after. Regards Leonidas -- Caution: breathing may be hazardous to your health. #include <stdio.h> int main(){printf("%s","\x4c\x65\x6f\x6e\x69\x64\x61\x73");}
