Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: TortoiseMerge Tool request

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: TortoiseMerge Tool request

Author golan davidovits <golandav at yahoo dot com>
Full name golan davidovits <golandav at yahoo dot com>
Date 2009-01-17 21:19:23 PST
Message I see it works for diff but not for conflict resolution view.

Thanks,
Golan



----- Original Message ----
From: Simon Large <simon.tortoisesv​n@googlemail.com>​
To: users at tortoisesvn dot tigris dot org
Sent: Sunday, January 18, 2009 12:56:37 AM
Subject: Re: TortoiseMerge Tool request

2009/1/17 golan davidovits <golandav at yahoo dot 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.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessageId=1​031351

To unsubscribe from this discussion, e-mail: [users-unsubscribe@t​ortoisesvn.tigris.or​g].

« Previous message in topic | 5 of 12 | Next message in topic »

Messages

Show all messages in topic

TortoiseMerge Tool request golan davidovits <golandav at yahoo dot com> golan davidovits <golandav at yahoo dot com> 2009-01-17 14:30:09 PST
     Re: TortoiseMerge Tool request simonlarge Simon Large 2009-01-17 14:40:45 PST
     Re: TortoiseMerge Tool request golan davidovits <golandav at yahoo dot com> golan davidovits <golandav at yahoo dot com> 2009-01-17 14:51:21 PST
         Re: TortoiseMerge Tool request simonlarge Simon Large 2009-01-17 14:56:38 PST
     Re: TortoiseMerge Tool request golan davidovits <golandav at yahoo dot com> golan davidovits <golandav at yahoo dot com> 2009-01-17 21:19:23 PST
     RE: TortoiseMerge Tool request webpost at tigris dot org webpost at tigris dot org 2009-04-28 06:04:05 PDT
         Re: TortoiseMerge Tool request simonlarge Simon Large 2009-04-28 07:03:17 PDT
             RE: Re: TortoiseMerge Tool request webpost at tigris dot org webpost at tigris dot org 2009-04-28 07:53:20 PDT
                 Re: Re: TortoiseMerge Tool request simonlarge Simon Large 2009-04-28 08:52:40 PDT
                     RE: Re: Re: TortoiseMerge Tool request webpost at tigris dot org webpost at tigris dot org 2009-04-28 09:18:39 PDT
                     RE: Re: TortoiseMerge Tool request tgleason Todd C. Gleason 2009-04-28 09:23:26 PDT
             RE: Re: TortoiseMerge Tool request webpost at tigris dot org webpost at tigris dot org 2009-04-28 07:56:18 PDT
Messages per page: