summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
AgeCommit message (Expand)Author
2007-04-18Custom low-level merge driver: change the configuration scheme.Junio C Hamano
2007-04-18Custom low-level merge driver support.Junio C Hamano
2007-04-17Add a demonstration/test of customized merge.Junio C Hamano