diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:47 -0700 |
| commit | 6cceea19eb6b86a4a293c92fe9653ccc8bb71526 (patch) | |
| tree | f6982b6db7ab3723fd4b5d1b4db3b44f8affd759 /t/t4013/diff.diff-tree_-r_--abbrev=4_initial | |
| parent | Merge branch 'rs/preserve-merges-unused-code-removal' (diff) | |
| parent | sequencer: avoid garbled merge machinery messages due to commit labels (diff) | |
| download | tgif-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.tar.xz | |
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
Diffstat (limited to 't/t4013/diff.diff-tree_-r_--abbrev=4_initial')
0 files changed, 0 insertions, 0 deletions