[Libreoffice] [PATCHES] Eight "small" patches to remove trailing whitespaces from help

[Miklos Vajna]

On Mon, Nov 15, 2010 at 02:08:52PM +0100, Jan Holesovsky <kendy at 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.)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101115/bbaebb7e/attachment.pgp>