Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
commitc8a8951ce56e497775784babb025e0c26a889f7c
treee5b630e43b7803092f59f0ba5cbb995a9a42e923
parent3817d631de9ca75ef60fd18165ffc7ee4f8ab269
parent6362ed0b29eb281cd44487684da2296a4f431946
Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'

Update an error message.

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