On Mon, Nov 15, 2010 at 02:08:52PM +0100, Jan Holesovsky <kendy@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.)
Attachment:
pgppTtIkY4eaW.pgp
Description: PGP signature
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.