Merge branch 'yd/doc-merge-annotated-tag' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (1 09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:37 +0000 (1 09:19 -0700)
* yd/doc-merge-annotated-tag:
  Documentation: merging a tag is a special case

1  2 
Documentation/git-merge.txt

Simple merge