diff options
| author |  Sven Strickroth <sven@cs-ware.de> | 2016-03-21 23:29:40 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-21 15:32:24 -0700 |
| commit | b64c1e0718f4a54d75b8faf0421471faa531af68 (patch) | |
| tree | 6f8db8e995f8e37bb773834f0d9f96d1fd7621ba /t/t5515/fetch.br-branches-one-octopus_branches-one | |
| parent | memoize common git-path "constant" files (diff) | |
| download | tgif-b64c1e0718f4a54d75b8faf0421471faa531af68.tar.xz | |
commit: do not lose SQUASH_MSG contents
When concluding a conflicted "git merge --squash", the command
failed to read SQUASH_MSG that was prepared by "git merge", and
showed only the "# Conflicts:" list of conflicted paths.
Place the contents from SQUASH_MSG at the beginning, just like we
show the commit log skeleton first when concluding a normal merge,
and then show the "# Conflicts:" list, to help the user write the
log message for the resulting commit.
Test by Junio C Hamano <gitster@pobox.com>.
Signed-off-by: Sven Strickroth <sven@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-branches-one-octopus_branches-one')
0 files changed, 0 insertions, 0 deletions