Contact: StephenLeake

Provide simple flow to resolve non-content conflicts.

Strategy: Add conflicts store``,conflicts resolve_*` commands, to let the user specify conflict resolutions asynchronously from the merge process.

Status: landed