From: Gregory Jefferis <jefferis@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Choosing a mergetool according to file type
Date: Fri, 26 Jun 2009 12:04:54 +0100 [thread overview]
Message-ID: <C66A69E6.205F2%jefferis@gmail.com> (raw)
In-Reply-To: <4A44A66B.10906@viscovery.net>
Hi Johannes,
On 2009-06-26 11:43, "Johannes Sixt" <j.sixt@viscovery.net> wrote:
> I don't think that you can choose the merge tool by setting attributes.
OK, that was my impression, but I wanted to check.
> The reason I write to you is: Can you tell me what 'wordgitmerge' and
> 'wordgitdiff' are?
>
> I, too, have a number of Word files that I need to merge every now and then.
Ah! Well they are nothing fancy, I'm afraid, just scripts that call Word
itself, but that turns out to work pretty well. For Mac (my platform) they
have to be in applescript. For Windows I imagine they could be pretty much
the same as the scripts here:
http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/diff-scripts/
diff-doc.js
merge-doc.js
Perhaps tortoisegit already exposes this. Those scripts include fallbacks
for openoffice so I suppose one could use that on linux.
Best,
Greg.
next parent reply other threads:[~2009-06-26 11:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4A44A66B.10906@viscovery.net>
2009-06-26 11:04 ` Gregory Jefferis [this message]
2009-06-26 11:29 ` Choosing a mergetool according to file type Johannes Sixt
2009-06-26 12:04 ` Matthieu Moy
2009-06-26 13:27 ` Gregory Jefferis
2009-06-26 13:51 ` Matthieu Moy
2009-06-26 16:57 ` Junio C Hamano
2009-06-26 17:43 ` Gregory Jefferis
2009-06-26 17:03 ` Gregory Jefferis
2009-06-26 10:28 Gregory Jefferis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C66A69E6.205F2%jefferis@gmail.com \
--to=jefferis@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).