rebase -r: demonstrate bug with conflicting merges
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Nov 2018 23:25:57 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 03:04:00 +0000 (12:04 +0900)
commitf08110d...d84438f4a8d69c145fae7f65fc91940f
tree20a24c3...af03a01c058a526eb8a95d7eccc1c576copy hash to clipboard (tree)
parent8858448...b49332d353febc078ce4a3abcc962efecopy hash to clipboard (diff)
t/t3430-rebase-merges.sh