aboutsummaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
Commit message (Expand)AuthorAge
* t3507: Make test executableStephen Boyd2010-04-11
* cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
* revert: clarify label on conflict hunksJonathan Nieder2010-03-20
* tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-20