Merge went to hell,

My guess is a newline problem, but for whatever reason PerForce decided
that all files in conflict were conflicting on literally everything
*except* the last closing curley brace.
Worth investigating.