2 Commits (1d5742cbf746f9556e6aefdfbed54c452c235d51)

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