Code

Merge branch 'am/cherry-pick-rerere'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700)
commit88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31
treeb4550d79e5f34a8817ea787b299cabf8174c81c6
parentb46f7e54fcb2d01757d834d14dfd040b6892d695
parentaa1a0111cc0e2a12c21ed05c88d8e9872fc166b2
Merge branch 'am/cherry-pick-rerere'

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