Re: Command line paramters for extenal merge tool

On 15.01.2014 13:44, Lübbe Onken wrote:
> Hi Stefan,
>
> Thanks for adding the "nq" parameters. I just saw your commit. This
> helps already. How about the %fname parameter, which just returns the
> plain name of the file which is in conflict?

Done in r25143.
But note that %fname is empty if two different files/paths are compared
instead of comparing two states of the same file.
It's never empty for a three-way diff.

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=3071655
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].