2 Commits (e2a0ccc01fab1770bd3b2767481137c6f728e5ab)

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