t3430: add conflicting commit
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 15 Aug 2018 09:39:34 +0000 (10:39 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2018 15:52:58 +0000 (08:52 -0700)
commitd54e189...6291474f077283c9d4cb5e970e1373a4
tree7553b8f...3547f38f0497f603582f1ac55067367ecopy hash to clipboard (tree)
parent53f9a3e...57dbbc901a02ac2c73346d375e24978ccopy hash to clipboard (diff)
t/t3430-rebase-merges.sh