2 Commits (d71abd99f82e7076775f12deb9326f7d26761591)

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