summaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
AgeCommit message (Expand)Author
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren
2017-11-12t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller
2014-07-14cherry-pick: add t3512 for submodule updatesJens Lehmann