summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano1-0/+12
2008-09-25Merge branch 'mv/merge-recursive'Libravatar Shawn O. Pearce1-0/+22
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Libravatar Miklos Vajna1-0/+22
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Libravatar Nanako Shiraishi1-6/+6
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