summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-2/+2
2008-08-11Make cherry-pick use rerere for conflict resolution.Libravatar Abhijit Menon-Sen1-0/+45