On Mon, Nov 15, 2010 at 02:08:52PM +0100, Jan Holesovsky <ke...@suse.cz> wrote: > I am sorry, but as discussed previously [1], we would prefer not to fix > the trailing whitespace yet, until git with better merge strategies (to > handle whitespace changes flawlessly during merges) is released.
Have you tried the ignore-all-space option of git merge-recursive, which was added recently in version 1.7.2? (It was released this summer.)
pgpliNWu4ARih.pgp
Description: PGP signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
