Re: TortoiseMerge: Can set encoding and EOL

On 21.05.2013 16:28, ch3cooli wrote:
> TortoiseMerge: Can set encoding and EOL
> See patch.
>
> Since TortoiseMergeENG.rc is in UTF-16, it is attached separately, not inside the patch file.

next time, don't forget the resource.h file since that's also in UTF-16 :)

Committed your patch in r24222 but with a few modifications (minor
changes, nothing major).

I first thought of just adding combo boxes to the statusbar itself, but
that looked really, really ugly. So I reverted that and used your patch
instead.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3056102
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].