Merge branch 'mv/sequencer-pick-error-diag'
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 May 2013 20:30:19 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 May 2013 20:30:19 +0000 (13:30 -0700)
Fix "git cherry-pick $annotated_tag", which was mistakenly rejected.

* mv/sequencer-pick-error-diag:
cherry-pick: picking a tag that resolves to a commit is OK

1  2 
sequencer.c
diff --cc sequencer.c
Simple merge