2 Commits (b73c6834dd8796a9d6a8443dfd75368f5a91e5c2)

Author SHA1 Message Date
Jonathan Nieder a48fcd8369 tests: add missing && 15 years ago
Abhijit Menon-Sen aa1a0111cc Make cherry-pick use rerere for conflict resolution. 17 years ago