summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
AgeCommit message (Expand)Author
2010-11-09tests: add missing &&Jonathan Nieder
2008-08-11Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen