t2000: rename and combine checkout clash tests