diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-17 12:23:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-19 05:05:36 +0200 |
| commit | 1a2b985fb375e7ce14932bfc59365024af2fb6ab (patch) | |
| tree | 037601e08fa0b4b958b8342b77f991c75799ca97 /tree.c | |
| parent | sequencer.c: save and restore cleanup mode (diff) | |
| download | git-1a2b985fb375e7ce14932bfc59365024af2fb6ab.tar.xz git-1a2b985fb375e7ce14932bfc59365024af2fb6ab.zip | |
cherry-pick/revert: add scissors line on merge conflict
Fix a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.
Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree.c')
0 files changed, 0 insertions, 0 deletions