diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-17 06:29:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-17 06:29:34 (GMT) |
| commit | c8a8951ce56e497775784babb025e0c26a889f7c (patch) | |
| tree | e5b630e43b7803092f59f0ba5cbb995a9a42e923 /combine-diff.c | |
| parent | 3817d631de9ca75ef60fd18165ffc7ee4f8ab269 (diff) | |
| parent | 6362ed0b29eb281cd44487684da2296a4f431946 (diff) | |
| download | git-c8a8951ce56e497775784babb025e0c26a889f7c.zip git-c8a8951ce56e497775784babb025e0c26a889f7c.tar.gz git-c8a8951ce56e497775784babb025e0c26a889f7c.tar.bz2 | |
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions