merge: allow reading the merge commit message from a file
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 22 Dec 2017 14:10:02 +0000 (15:10 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 21:47:05 +0000 (14:47 -0700)
This is consistent with `git commit` which, like `git merge`, supports
passing the commit message via `-m <msg>` and, unlike `git merge` before
this patch, via `-F <file>`.

It is useful to allow this for scripted use, or for the upcoming patch
to allow (re-)creating octopus merges in `git rebase --rebase-merges`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found