summaryrefslogtreecommitdiffstats
path: root/t/t3504-cherry-pick-rerere.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-121-0/+45