tree 494c7c297c9f79be13ba77531ed7c668949a7415
parent f612a71cc901e34f5cf154e6605b7251744f6b95
author Junio C Hamano <gitster@pobox.com> 1306352639 -0700
committer Junio C Hamano <gitster@pobox.com> 1306355657 -0700

merge: reword the final message

Ever since the merge command was made multi-strategy aware, we said

    Merge made by octopus.

at the end of a session.  Reword it to

    Merge made by the 'octopus' strategy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>