summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
AgeCommit message (Expand)Author
2010-01-21conflict-marker-size: add test and docsJunio C Hamano
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-07builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi
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