![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 May 2011 19:43:59 +0000 (12:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 May 2011 20:34:17 +0000 (13:34 -0700) | ||
| commit | f23101bf9f29d1404fa8ab1cdab619c335cb7f17 | |
| tree | 494c7c297c9f79be13ba77531ed7c668949a7415 | tree | snapshot |
| parent | f612a71cc901e34f5cf154e6605b7251744f6b95 | commit | diff |
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>
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>
| builtin/merge.c | diff | blob | history | |
| t/t7602-merge-octopus-many.sh | diff | blob | history |