Merge branch 'cb/doc-fetch-pull-merge'
commit0f06f3ff76bea09a2344adacca5bfc0d637b2086
authorJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:05:38 +0000 (30 20:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:05:38 +0000 (30 20:05 -0700)
treef3492b6b08cb5b96150dc5d9dd2ab3752707721c
parente7e55483439b2e1f483e3753109a433f2fba1a26
parentd504f6975d34025ed3b5478b657789410b52cdb1
Merge branch 'cb/doc-fetch-pull-merge'

* cb/doc-fetch-pull-merge:
  modernize fetch/merge/pull examples