I owe @pjf an apology.<br><br>Whilst you can use the approach below to show Openoffice diffs, there is no documented command line option in OpenOffice to allow it work as a merge tool, so you cannot create a Git customised merge driver :-(.<br>
<br><br><br><br><div class="gmail_quote">On Thu, Jul 9, 2009 at 13:01, Alec Clews <span dir="ltr"><<a href="mailto:alec.clews@gmail.com">alec.clews@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
This is not quiet the question @pjf asked last night, but still it shows how you can integrate OpenOffice docs with Git<br><br><a href="http://git.or.cz/gitwiki/GitTips#HowtousegittotrackOpenDocument.28OpenOffice.2CKoffice.29files.3F" target="_blank">http://git.or.cz/gitwiki/GitTips#HowtousegittotrackOpenDocument.28OpenOffice.2CKoffice.29files.3F</a><br clear="all">
<font color="#888888">
<br>-- <br>Alec Clews<br>Personal <<a href="mailto:alec.clews@gmail.com" target="_blank">alec.clews@gmail.com</a>> Melbourne, Australia.<br>Jabber: <a href="mailto:alecclews@jabber.org.au" target="_blank">alecclews@jabber.org.au</a> PGPKey ID: 0x9BBBFC7C<br>
blog:<a href="http://alecthegeek.wordpress.com/" target="_blank">http://alecthegeek.wordpress.com/</a><br>
</font></blockquote></div><br><br clear="all"><br>-- <br>Alec Clews<br>Personal <<a href="mailto:alec.clews@gmail.com">alec.clews@gmail.com</a>> Melbourne, Australia.<br>Jabber: <a href="mailto:alecclews@jabber.org.au">alecclews@jabber.org.au</a> PGPKey ID: 0x9BBBFC7C<br>
blog:<a href="http://alecthegeek.wordpress.com/">http://alecthegeek.wordpress.com/</a><br>