Re: TortoiseMerge apply unified diff error

Glenn R Heard Jr wrote:
> On Wednesday, December 14, 2005 1:55 PM, Stefan Küng
> <mailto:tortoisesvn@gmail.com> wrote:
>
>> If you can send the diff file (zipped please - to make sure the mail
>> clients don't change e.g. lineendings) I can have a look.
>>
>
> Here is the diff.
>
> Thanks for looking at this Stefan.

Yes, the "Index: filepath" line is missing. Not sure if I will change
TortoiseMerge to support these kind of diff files too. It currently only
supports diff files created with a Subversion client. I thought that the
linux diff tool would create the same kind of diff-files, but obviously
I was wrong :(

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org