diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-08-15 10:39:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-16 08:52:58 -0700 |
| commit | d54e18986291474f077283c9d4cb5e970e1373a4 (patch) | |
| tree | 7553b8fa3547f38f0497f603582f1ac55067367e /t/t9601/cvsroot/module/imported-twice.txt,v | |
| parent | Git 2.18 (diff) | |
| download | tgif-d54e18986291474f077283c9d4cb5e970e1373a4.tar.xz | |
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>
Diffstat (limited to 't/t9601/cvsroot/module/imported-twice.txt,v')
0 files changed, 0 insertions, 0 deletions