Re: [PATCH v2] merge-recursive: fix the diff3 common ancestor label for virtual commits

2019-10-01 Thread Jeff King
On Mon, Sep 30, 2019 at 11:58:49PM -0700, Elijah Newren wrote: > In commit 743474cbfa8b ("merge-recursive: provide a better label for > diff3 common ancestor", 2019-08-17), the label for the common ancestor > was changed from always being > > "merged common ancestors" > > to instead be

[PATCH v2] merge-recursive: fix the diff3 common ancestor label for virtual commits

2019-09-30 Thread Elijah Newren
In commit 743474cbfa8b ("merge-recursive: provide a better label for diff3 common ancestor", 2019-08-17), the label for the common ancestor was changed from always being "merged common ancestors" to instead be based on the number of merge bases: >=2: "merged common ancestors"