Merge branch 'km/doc-workflows-typofix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000 (10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000 (10:18 -0700)
Typofix.

* km/doc-workflows-typofix:
  gitworkflows: fix grammar in 'Merge upwards' rule

1  2 
Documentation/gitworkflows.txt

Simple merge