diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-17 11:23:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-18 13:49:29 +0900 |
| commit | 1055997e2fc707a15baf232df2ac481055c14321 (patch) | |
| tree | 4d32fd986b4c02811266f3db3d087858afcd4a53 /commit.c | |
| parent | d540b70c85ccd08507348785fd210ef8317a864d (diff) | |
| download | git-1055997e2fc707a15baf232df2ac481055c14321.tar.gz | |
merge: add scissors line on merge conflict
This fixes a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.
Next, if commit.cleanup = scissors is specified, don't produce a
scissors line in commit if one already exists in the MERGE_MSG file.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions