Re: Unicode files
From: Jarl Friis <jarl_at_softace.dk>
Date: 2006-07-23 20:30:09 CEST
Hi Erik.
Thanks for your reply.
"Erik Huelsmann" <ehuels@gmail.com> writes:
> Well, in that case, you need to find the right diff3 tool :-) See the
Not until now do I realise that the diff3-cmd (if specified) is
> Subversion won't merge anything which it's told is binary. If you tell
Thanks.
> BTW: I think this is a users@ question as it doesn't directly pertain
I did ask earlier on the users-list, but never got any replies, hence
I do admit however, that I deserve a "RTFM", because have I read the
Yet...
It is clear to me now that it is possible, by specifying external tools,
Jarl
-- Jarl Friis Softace ApS Omøgade 8, 2.sal 2100 København Ø. Denmark Phone: +45 26 13 20 90 E-mail: jarl@softace.dk LinkedIn: https://www.linkedin.com/in/jarlfriis --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.orgReceived on Sun Jul 23 20:30:41 2006 |
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.