diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2024-02-27 01:17:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 09:40:47 -0800 |
| commit | e90cc075cc43f2bf08a8963ae84d3e4da50ebfc3 (patch) | |
| tree | c63cf0c9d22cc0f2ae3b4e1845a78ffd162036b0 /t/t4013/diff.format-patch_--inline_--stdout_initial..main^ | |
| parent | 688a0a751e9ee032be9fb70d7d63220bc85acae1 (diff) | |
| download | git-e90cc075cc43f2bf08a8963ae84d3e4da50ebfc3.tar.gz git-e90cc075cc43f2bf08a8963ae84d3e4da50ebfc3.zip | |
commit: unify logic to avoid multiple scissors lines when merging
prepare_to_commit has some logic to figure out whether merge already
added a scissors line, and therefore it shouldn't add another. Now that
wt_status_add_cut_line has built-in state for whether it has
already added a previous line, just set that state instead, and then
remove that condition from subsequent calls to wt_status_add_cut_line.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions