git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f3ef6b6)
Allow the default low-level merge driver to be configured.
authorJunio C Hamano <redacted>
Wed, 18 Apr 2007 08:47:21 +0000 (01:47 -0700)
committerJunio C Hamano <redacted>
Wed, 18 Apr 2007 08:50:00 +0000 (01:50 -0700)
commitbe89cb239e8ec02e23015675cc8b2d60992a6cfc
tree8e3421b7ef05e9844a7f21c6908f822b29a3c295tree | snapshot
parentf3ef6b6bbe9bfd3d09130f7e26b87dbe11b93c5bcommit | diff
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 <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT