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

RE: [TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Hughes, Bill <Bill.Hughes_at_cox.co.uk>
Date: 2004-09-27 11:54:30 CEST

Simon Large wrote:
> "Timothy B K. Kientzle" wrote
>
>> Using TortoiseMerge, I've been missing
>> a feature of Emacs Ediff system, which
>> highlights the differences within each
>> line (it helps to know what few words are
>> really different on two varying lines).
>
> Yes, I have seen that on another RCS along time ago and it is a nice
> feature. TMerge does help you in diff view though. When you
> hover the mouse
> over a difference in the left or right pane, TMerge shows the 2 lines
> one above the other in the 3rd pane which is good for picking out
> small differences.

This is the main reason I use kdiff3 - when I can't quite see what's going
on in Tmerge (or whatever) I use kdiff3 to look at the differences within
the line, it's three way too but it is _ugly_.

Bill

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
This e-mail transmission is strictly confidential and intended solely
for the person or organisation to whom it is addressed. It may contain
privileged and confidential information and if you are not the intended
recipient, you must not copy, distribute or take any action in reliance
on it. If you have received this email in error, please reply to the
sender as soon as possible and delete the message. Please note that we
are able to, and reserve the right to, monitor e-mail communications
passing through our network.
The views expressed in this email are not that of the company unless
specified within the message.
The inclusion of this footnote indicates that the mail message and any
attachments have been checked for the presence of known viruses.
If you have any comments regarding our policy please direct them to
postmaster@cox.co.uk
________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 12:56:39 2004

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