Merge branch 'ks/branch-set-upstream'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 18:23:23 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 18:23:23 +0000 (11:23 -0700)
A test title has been reworded to clarify it.

* ks/branch-set-upstream:
t3200: clarify description of --set-upstream test

1  2 
t/t3200-branch.sh
Simple merge