I would like to see the internal file merge to be of equal citizenship with
external merge tools. Like Daniel said elsewhere, extracting it as a separate
executable is one way to achieve that.
"file merge" is a great name, except it's not the name we already use for
specifying the file merge to
On Mon, Apr 7, 2014 at 8:01 PM, Daniel Shahaf wrote:
> Stefan Sperling wrote on Mon, Apr 07, 2014 at 18:00:21 +0200:
>> A new --file-merge option is the simplest way of solving this
>> problem I could come up with. It maps the options provided by
>> the internal merge tool to a command line flag:
Stefan Sperling wrote on Mon, Apr 07, 2014 at 18:00:21 +0200:
> A new --file-merge option is the simplest way of solving this
> problem I could come up with. It maps the options provided by
> the internal merge tool to a command line flag:
>
> --file-merge ARG : Set a pre-defined choice
Hi,
the patch below adds a --file-merge option, in an attempt to solve
issue #4487 "add a scriptable non-interactive option for additive merges"
http://subversion.tigris.org/issues/show_bug.cgi?id=4487
There's been a discussion on IRC about this today:
http://colabti.org/irclogger/irclogger_log/s
4 matches
Mail list logo
