[PATCH 2 of 3] merge: introduce method to minimize merge regions

Jun Wu quark at fb.com
Wed Feb 10 12:32:53 EST 2016


On 02/10/2016 05:23 PM, Martin von Zweigbergk wrote:
> This is what Ryan said:
>
> "Whoops, this should be a2 - endmatches
>
> Thanks to Jun Wu for giving me some test cases that uncovered this
> bug. I'll send out a v2 with the fix."
>
> And then he sent a V2 with one line changed accordingly. Are you
> saying that fix was unrelated to the "test cases that uncovered this
> bug"?
>

Sorry, I thought it was another one.

The test case Ryan mentioned is originally from marmoute's commit
2ea6d906cf9b, "Practical disaster: programing language have a lot of
common line".


More information about the Mercurial-devel mailing list