summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: add missing &&Jonathan Nieder2010-11-091-2/+2
* Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-111-0/+45