]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_-m_-p_master
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9cdf86b 7d056de)
Merge branch 'en/sequencer-merge-labels'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:47 +0000 (16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:47 +0000 (16:14 -0700)
commit6cceea19eb6b86a4a293c92fe9653ccc8bb71526
treef6982b6db7ab3723fd4b5d1b4db3b44f8affd759tree | snapshot
parent9cdf86b2ee998d66008eeb9690571939db9074e2commit | diff
parent7d056deacea488833192d517059e04916285e90fcommit | diff
Merge branch 'en/sequencer-merge-labels'

The commit labels used to explain each side of conflicted hunks
placed by the sequencer machinery have been made more readable by
humans.

* en/sequencer-merge-labels:
  sequencer: avoid garbled merge machinery messages due to commit labels
sequencer.c diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
t/t3507-cherry-pick-conflict.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.