Contact: StephenLeake

The branch name is misleading; the automate_show_conflicts branch is now about implementing file sutures.

The original work on conflict resolution moved to nvm.resolve_conflicts, which has landed.

Strategy: Support file sutures, to provide true resolution of duplicate name conflicts by recording both parents.

Status: Stalled Abandoned August 2008; way too much work for very little gain.