summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAgeFilesLines
* t3507: Make test executableStephen Boyd2010-04-111-0/+0
* cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-2/+2
* revert: clarify label on conflict hunksJonathan Nieder2010-03-201-2/+2
* tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-201-0/+198