A program for converting git's diff3-style conflict markers into diff
output.