tree 7553b8fa3547f38f0497f603582f1ac55067367e
parent 53f9a3e157dbbc901a02ac2c73346d375e24978c
author Phillip Wood <phillip.wood@dunelm.org.uk> 1534325974 +0100
committer Junio C Hamano <gitster@pobox.com> 1534434778 -0700

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>