| commit | be89cb239e8ec02e23015675cc8b2d60992a6cfc | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 18 Apr 2007 08:47:21 +0000 (18 01:47 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 18 Apr 2007 08:50:00 +0000 (18 01:50 -0700) | ||
| tree | 8e3421b7ef05e9844a7f21c6908f822b29a3c295 | treesnapshot (tar.gz zip) |
| parent | f3ef6b6bbe9bfd3d09130f7e26b87dbe11b93c5b | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |