From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Apr 2017 06:29:34 +0000 (-0700)
Subject: Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'
X-Git-Tag: v2.13.0-rc0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8a8951ce56e497775784babb025e0c26a889f7c;p=thirdparty%2Fgit.git

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
---

c8a8951ce56e497775784babb025e0c26a889f7c