2 Commits (83838d5c1b8ca2efee52184136776c3cf7d5df2f)

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