[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: Wed, 20 Aug 2008 18:11:42 +0200

Absynthe wrote:
> When I do a merge between 2 files and I try to create a unified diff
> file, the file created is empty.

Works for me just fine.

* is the file really empty (0 bytes)? Or maybe just the diff?
* what's the encoding of your files (shown in the bottom right statusbar)

Stefan 

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

Received on 2008-08-20 18:12:06 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.