> Agreed. And hey, I didn't know about merge.conflictstyle, that'll make my > life > much easier, thanks!
Anytime! Try also kdiff3 as mergetool. -- Edward "Hades" Toroshchin dr_lepper on irc.freenode.org _______________________________________________ Amarok-devel mailing list Amarok-devel@kde.org https://mail.kde.org/mailman/listinfo/amarok-devel
