Field

Ticket #13 (new defect)

Opened 1 year ago

Last modified 1 year ago

Need UI for three-way merging over templates

Reported by: marc Assigned to: marc
Priority: major Milestone: rc1
Component: core Version:
Keywords: Cc:

Description

Currently we should be tracking enough copy information to perform three-way merging over templates and their children, but there's no UI for it. We need to finish this idea.

Change History

01/21/2008 07:38:19 AM changed by marc

Dependant on Mercurial bug http://www.selenic.com/mercurial/bts/issue931