Comment 1 for bug 263302

Hi Jonny,

I'm not sure I understand your use case fully. In the example you present
you appear to have a file with a modification specific to A, and then merging
B overwrites this modification, is that what you are saying?

I don't understand why this would happen, as if both A and B had modified
the same area then it would cause a conflict, rather than overwriting it.

Or is it that A doesn't actually modify the file, it just doesn't want B's change?
The usual way to do this would be to "revert" out the changes, either using
the "revert" command or editing. I can see that it wouldn't be easy to do this
at the hunk level, as "revert" only works at the file level.

Is your request to have conflict regions for every change made by B, regardless
of whether A has modified that area?

Thanks,

James