History tests/checkout/conflict.c