summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)Author
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
2010-03-21tests: document cherry-pick behavior in face of conflictsJonathan Nieder