aboutsummaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
Commit message (Expand)AuthorAge
* tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-03
* Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-18
* Custom low-level merge driver support.Junio C Hamano2007-04-18
* Add a demonstration/test of customized merge.Junio C Hamano2007-04-17