summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
AgeCommit message (Expand)AuthorFilesLines
2007-04-18Custom low-level merge driver: change the configuration scheme.Libravatar Junio C Hamano1-2/+6
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano1-1/+70
2007-04-17Add a demonstration/test of customized merge.Libravatar Junio C Hamano1-0/+72