3 Commits (ccd14e569dcfe1a83b33f84fad8cfed68676ef5d)

Author SHA1 Message Date
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 18 years ago
Eric Wong 9a99c087da rebase: allow --merge option to handle patches merged upstream 19 years ago
Yann Dirson e77f489edf Add a test for rebase when a change was picked upstream 19 years ago