Allow the default low-level merge driver to be configured.
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 08:47:21 +0000 (01:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 08:50:00 +0000 (01:50 -0700)
commitbe89cb2...9e8ec02e23015675cc8b2d60992a6cfc
tree8e3421b...ef05e9844a7f21c6908f822b29a3c295copy hash to clipboard (tree)
parentf3ef6b6...be9bfd3d09130f7e26b87dbe11b93c5bcopy hash to clipboard (diff)
merge-recursive.c