From: Elijah Newren Date: Thu, 21 Dec 2017 19:36:38 GMT Subject: Re: [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse Message-ID: In-Reply-To: <20171221191907.4251-2-newren@gmail.com> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren 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 > --- 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.