summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorLibravatar Noam Postavsky <npostavs@users.sourceforge.net>2018-09-01 20:07:16 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-12 12:22:48 +0900
commit04005834ed07e0b3a63793f386570c8bcf73f9a3 (patch)
treeea5188d2ff343854b64fad8572dbd9c8083a9009 /git-gui/git-gui.sh
parentGit 2.14.5 (diff)
downloadtgif-04005834ed07e0b3a63793f386570c8bcf73f9a3.tar.xz
log: fix coloring of certain octopus merge shapes
For octopus merges where the first parent edge immediately merges into the next column to the left, the number of columns should be one less than the usual case. First parent to the left case: | *-. | |\ \ |/ / / The usual case: | *-. | |\ \ | | | * Also refactor the code to iterate over columns rather than dashes, building from an initial patch suggested by Jeff King. Signed-off-by: Noam Postavsky <npostavs@users.sourceforge.net> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions