@matheusbsbs / matheus-bagliano / commits / 88ab18dfef
Fork 0

Merge branch 'am/cherry-pick-rerere'

* am/cherry-pick-rerere: Make cherry-pick use rerere for conflict resolution.

Junio C Hamano committed Aug 27, 2008 at 16:40 UTC 88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31

No changes.