summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
AgeCommit message (Expand)AuthorFilesLines
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-2/+2
2010-03-20tests: document cherry-pick behavior in face of conflictsLibravatar Jonathan Nieder1-0/+198