This is a program to turn git diff3 conflict-resolution text into diff files. See the block comment at the beginning of gitconfdiff.c for documentation.