diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-18 01:47:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-18 01:50:00 -0700 |
| commit | be89cb239e8ec02e23015675cc8b2d60992a6cfc (patch) | |
| tree | 8e3421b7ef05e9844a7f21c6908f822b29a3c295 /send-pack.c | |
| parent | f3ef6b6bbe9bfd3d09130f7e26b87dbe11b93c5b (diff) | |
| download | git-be89cb239e8ec02e23015675cc8b2d60992a6cfc.tar.gz | |
Allow the default low-level merge driver to be configured.
When no 'merge' attribute is given to a path, merge-recursive
uses the built-in xdl-merge as the low-level merge driver.
A new configuration item 'merge.default' can name a low-level
merge driver of user's choice to be used instead.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'send-pack.c')
0 files changed, 0 insertions, 0 deletions