diff options
| author | Adam Simpkins <adam@adamsimpkins.net> | 2008-06-01 13:56:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 14:50:52 -0700 |
| commit | 3395908ee481e91bbe3ba054a7419b071b09cdef (patch) | |
| tree | ef7c62ff82201d010fa9726f05eb3938188c8e15 /GIT-VERSION-GEN | |
| parent | b7166cce8cf4053d9f21e69505bef8699da68903 (diff) | |
| download | git-3395908ee481e91bbe3ba054a7419b071b09cdef.tar.gz git-3395908ee481e91bbe3ba054a7419b071b09cdef.tar.xz | |
graph API: improve display of merge commits
This change improves the way merge commits are displayed, to eliminate a
few visual artifacts. Previously, merge commits were displayed as:
| M \
| |\ |
As pointed out by Teemu Likonen, this didn't look nice if the rightmost
branch line was displayed as '\' on the previous line, as it then
appeared to have an extra space in it:
| |\
| M \
| |\ |
This change updates the code so that branch lines to the right of merge
commits are printed slightly differently depending on how the previous
line was displayed:
| |\ | | | | | /
| M \ | M | | M |
| |\ \ | |\ \ | |\ \
Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions