summaryrefslogtreecommitdiff
path: root/patch-ids.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 13:49:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 14:51:01 -0700
commit780fbeba63e792199a0974826a5ef0267af83c1a (patch)
tree0a5211e3f5f3ab8ad93f7c4ac8e2026bb2c20f69 /patch-ids.c
parentGit 2.14.1 (diff)
downloadtgif-780fbeba63e792199a0974826a5ef0267af83c1a.tar.xz
t4200: give us a clean slate after "rerere gc" tests
The "multiple identical conflicts" test counts the number of entries in the rerere database after trying a handful of mergy operations and recording their resolutions, but without initializing the rerere database to a known state, allowing the state left by previous tests to trigger a false failure. Make it robust by cleaning the database before it starts. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'patch-ids.c')
0 files changed, 0 insertions, 0 deletions