* vc-hooks.el (vc-state): Add new state `conflict'.