Comment 1 for bug 634982

Revision history for this message
Vincent Ladeuil (vila) wrote :

This is kind of the intent behind 'bzr resolve --take-this' (for all files outside of THIS root, don't bother me with the OTHER
modifications, I just don't care) except that you'd really want to do that at merge time.

A per-file merge hook should be able to call the relevant code though.

From a UI point of view we certainly need a way to *control* which options are set for which files, but there may be
a short cut for your particular use case.