]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 53f9a3e) | patch
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)
commitd54e18986291474f077283c9d4cb5e970e1373a4
tree7553b8fa3547f38f0497f603582f1ac55067367etree | snapshot
parent53f9a3e157dbbc901a02ac2c73346d375e24978ccommit | diff
t3430: add conflicting commit

Move the creation of conflicting-G from a test to the setup so that it
can be used in subsequent tests without creating the kind of implicit
dependencies that plague t3404. While we're at it simplify the
arguments to the test_commit() call the creates the conflicting commit.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3430-rebase-merges.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.