Custom low-level merge driver: change the configuration scheme.
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 18:27:32 +0000 (11:27 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 19:30:26 +0000 (12:30 -0700)
commit153920d...5b62024c0aceef23252b82ad18e5fe22
tree9b9d73e...f47df7aebd2a5fa5acb25a3f7518126bcopy hash to clipboard (tree)
parentbe89cb2...9e8ec02e23015675cc8b2d60992a6cfccopy hash to clipboard (diff)
merge-recursive.c
t/t6026-merge-attr.sh