Merge branch 'sb/unpack-trees-would-lose-submodule-message-update' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:13 +0000 (00:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:13 +0000 (00:55 -0700)
commit61d8ce8218bf93a58ac9d930bd256c88c2c99de0
tree3ab19009c303a4fc7cc926ca0f4986fa524a4d2e
parent706b224f1e4ec8a5c8d87238142ab59da7a487ae
parent6362ed0b29eb281cd44487684da2296a4f431946
Merge branch 'sb/unpack-trees-would-lose-submodule-message-update' into next

Update an error message.

* sb/unpack-trees-would-lose-submodule-message-update:
  unpack-trees.c: align submodule error message to the other error messages