Tree: 9317dc4f05

Commit Graph

1 Commits (9317dc4f051452a0e0f7a62a5531b16adf36b553)

Author	SHA1	Message	Date
Abhijit Menon-Sen	aa1a0111cc	Make cherry-pick use rerere for conflict resolution. ... Cherry-picking can be helped by reusing previous confliction resolution by invoking rerere automatically. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago