2 Commits (9e3e789e70701beb25b3135d292edfbc99035701)

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