3 Commits (b941ffac506d3f57246e46a8913da614e62a1d48)

Author SHA1 Message Date
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 19 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