Show a failure of rebase -p if the merge had a conflict
authorJohannes Sixt <j6t@kdbg.org>
Mon, 15 Dec 2008 10:05:30 +0000 (11:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Dec 2008 09:08:37 +0000 (01:08 -0800)
commit03c4829...47e26c844e589c61567a77a77c0658a9
tree710bb9f...8949675c82c5f90050fabea72026112ccopy hash to clipboard (tree)
parent5832d1a...da78273652c213d8e1535c09dd7dc079copy hash to clipboard (diff)
t/t3409-rebase-preserve-merges.sh