Browse Source
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>maint
Junio C Hamano
8 years ago
1 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue