[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge Tool request

From: golan davidovits <golandav_at_yahoo.com>
Date: Sat, 17 Jan 2009 21:19:22 -0800 (PST)

I see it works for diff but not for conflict resolution view.

Thanks,
Golan

----- Original Message ----
From: Simon Large <simon.tortoisesvn_at_googlemail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Sunday, January 18, 2009 12:56:37 AM
Subject: Re: TortoiseMerge Tool request

2009/1/17 golan davidovits <golandav_at_yahoo.com>:
> Thanks Simon for the explanation.
> I was thinking about what needed to make the internal Tortoise feature usable in "real world"
> and it seems very close to it...
>
> I do want to see the line differences, but also the words/chars specific diff.
> BTW, I don't see words diff currently. Is it configuration thing?

View->Settings->Colour code inline changes (turn word/char diff on)
View->Inline diff wordwise (toggle between word and char diffs)

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\    http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1031351
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1032068
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-18 06:19:30 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.