On Friday, 4 de February de 2011 08:47:08 Johannes Sixt wrote: > I can offer a set of git bundles that contain the merge results. (I don't > have push access yet.) Anyone interested?
Send to me. By the way, for the KDE readers here: git mergetool running kdiff3 is very useful too. Select the "Local" side usually. (that's C I think) -- Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org Senior Product Manager - Nokia, Qt Development Frameworks PGP/GPG: 0x6EF45358; fingerprint: E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
signature.asc
Description: This is a digitally signed message part.