[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 07:32:50 +0200

Bruno Bigras wrote:
> I also have this problem.
>
> "Show differences as unified diff" in "Check for modifications" work
> fine. But "Create unified diff file" in TortoiseMerge result in an
> empty (0 byte) file.
>
> The encoding is "ASCII LF / -1" and "ASCII LF / +1".

Can you zip two example files which you diff in TortoiseMerge and
produce an empty unified-diff and send the zip please?

Stefan 

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

Received on 2008-08-22 07:33:07 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.