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

Re: Bug in tortoise merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 22 Aug 2008 16:06:36 +0200

Bruno Bigras wrote:
> On Fri, 22 Aug 2008 07:32:50 +0200, Stefan Küng <tortoisesvn_at_gmail.com>
> wrote:
>> Can you zip two example files which you diff in TortoiseMerge and
>> produce an empty unified-diff and send the zip please?
>>
>
> No problem. Have a nice day.

Thanks for the files.
Unfortunately, when I diff those two files in TortoiseMerge and execute
"create unified diff", the patchfile is not empty but contains the real
unified diff.
So there must be something else which makes the diff fail on your system
but not on mine. Any ideas?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-08-22 16:06:53 CEST

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