Custom low-level merge driver support.
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 05:51:45 +0000 (22:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 08:43:42 +0000 (01:43 -0700)
commitf3ef6b6...be9bfd3d09130f7e26b87dbe11b93c5b
tree4dff356...896dfa2ddacdaff0e3c9ff06f8f0b91ecopy hash to clipboard (tree)
parent47579ef...009c6f7afaf31be107eb92395a4f10dbcopy hash to clipboard (diff)
merge-recursive.c
t/t6026-merge-attr.sh