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

Jan Holesovsky kendy at suse.cz
Mon Nov 15 23:41:28 PST 2010


Hi Miklos,

On 2010-11-15 at 21:29 +0100, Miklos Vajna 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.)

That's exactly the one I wanted to try/use, and still do not have it in
my 1.7.3.1 (from
http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_11/) :-(
Even the man page does not mention it here.

Do you know if there there si a build-time option to enable it, or
something?

Thank you,
Kendy



More information about the LibreOffice mailing list