]> Pileus Git - ~andy/git/search
Make cherry-pick use rerere for conflict resolution.