Merge branch 'sb/submodule-merge-in-merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:44 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000 (12:50 -0700)
Finishing touches to a topic that already is in 'master'.

* sb/submodule-merge-in-merge-recursive:
  merge-submodule: reduce output verbosity

1  2 
merge-recursive.c

Simple merge