Allow specifying specialized merge-backend per path.
authorJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 05:59:18 +0000 (22:59 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 21:11:20 +0000 (14:11 -0700)
commita129d96...4144215711e379565af97f6a82197f4f
tree218ef92...9369fccf9cd5a715728b883e1bac1fc2copy hash to clipboard (tree)
parent3e5261a...4071ca23c3514c0ebd5ee55f1e79d9cccopy hash to clipboard (diff)
merge-recursive.c