Re: TortoiseMerge apply unified diff error

Glenn R Heard Jr wrote:
> Hi.
>
> I made a unified diff with this version of cygwin diff:
> >diff -version
> diff (GNU diffutils) 2.8.7
> Written by Paul Eggert, Mike Haertel, David Hayes,
> Richard Stallman, and Len Tower.
>
> Using: diff -u file1.c file2.c > file3.c.diff
>
> When I tried to apply the diff using TortoiseMerge, I get the attached error
> msgbox.
>
> My version of TortoiseMerge is:
>
> TortoiseMerge 1.2.6, Build 4786 - 32 Bit
> libsvn_diff 1.2.3,
> apr 0.9.6
> apr-iconv 0.9.5
> apr-utils 0.9.6
>
> What am I doing wrong?

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.

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