From: Matthew Caron <matt.caron@redlion.net>
Date: Tue, 28 Aug 2012 17:41:51 GMT
Subject: Re: diff/merge tool that ignores whitespace changes
Message-ID: <503D02DF.3030802@redlion.net>
In-Reply-To: <1679275990.100371.1346175639379.JavaMail.root@genarts.com>

On 08/28/2012 01:40 PM, Stephen Bash wrote:
> ----- Original Message -----
>> From: "Enrico Weigelt" <enrico.weigelt@vnc.biz>
>> Sent: Tuesday, August 28, 2012 12:26:39 PM
>> Subject: diff/merge tool that ignores whitespace changes
>>
>> I'm looking for a diff / merge tool that treats lines with
>> only whitespace changes (trailing or leading whitespaces,
>> linefeeds, etc) as equal.
>>
>> The goal is to make reviews as well as merging or rebasing
>> easier when things like indentions often change.
>>
>> Does anybody know an solution for that ?

I'm fond of Meld.

-- 
Matthew Caron, Software Build Engineer
Sixnet, a Red Lion business | www.sixnet.com
+1 (518) 877-5173 x138 office