Thread (8 messages) 8 messages, 3 authors, 2016-08-11

Re: [PATCH] merge-recursive: configurable 'merge' program

flat view

From: Jakub Narebski <hidden>
Date: 2016-08-11 20:18:13

Sam Vilain wrote:
For those who like to spawn interactive merge tools on a merge failure
or otherwise run some kind of script, allow a "merge.tool" repo-config
option that will take arguments as merge(1) does.
How it goes together with merge-recursive rewrite using built-in merge tool
from xdiff, xdl_merge?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help