diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-25 12:43:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-25 13:34:17 -0700 |
| commit | f23101bf9f29d1404fa8ab1cdab619c335cb7f17 (patch) | |
| tree | 494c7c297c9f79be13ba77531ed7c668949a7415 /git-difftool.perl | |
| parent | gitweb: Refactor reading and parsing config file into read_config_file (diff) | |
| download | tgif-f23101bf9f29d1404fa8ab1cdab619c335cb7f17.tar.xz | |
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>
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions