From: Junio C Hamano <redacted>
Date: Wed, 19 Aug 2020 23:14:47 +0000 (-0700)
Subject: Merge branch 'en/sequencer-merge-labels'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6cceea19eb6b86a4a293c92fe9653ccc8bb71526;p=git.git

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
---

6cceea19eb6b86a4a293c92fe9653ccc8bb71526