On Fri, Dec 22, 2017 at 12:46 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Elijah Newren <newren@xxxxxxxxx> writes: > >> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren <newren@xxxxxxxxx> wrote: >>> index_has_changes() is a function we want to reuse outside of just am, >>> making it also available for merge-recursive and merge-ort. >>> >>> Signed-off-by: Elijah Newren <newren@xxxxxxxxx> >>> --- >> >> Note: These patches built on master, and merge cleanly with next and >> pu. However, this patch has a minor conflict with maint. If you'd >> prefer a version that applies on top of maint, let me know and I'll >> resubmit. > > I think I managed to create two topics, one that is with these three > patches (2/3 backported) on top of maint and the other one merges > the former on top of master. Please see if you found a mismerge > when I push the results out. I'm about to head out on a multi-day trip, so I might not get to this until the middle of next week. I'll try to take a look as soon as I can, though.
