2 Commits (c09cd77ea2fe3580b33918a99fe138d239ac2aaf)

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