diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2009-04-05 02:47:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-05 00:26:33 -0700 |
| commit | 39d8e271f42e976a61f08a4f7bc2047a682ac532 (patch) | |
| tree | dbf1f297e9e8716ae66e903933e9b3a8af0928c1 /t/t3030-merge-recursive.sh | |
| parent | update cache for conflicting submodule entries (diff) | |
| download | tgif-39d8e271f42e976a61f08a4f7bc2047a682ac532.tar.xz | |
simplify output of conflicting merge
This simplifies the code without changing the semantics and removes
the unhelpful "needs $sha1" part of the conflicting submodule message.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions