From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Apr 2016 16:23:59 GMT
Subject: Re: [PATCHv5 0/2] xdiff: implement empty line chunk heuristic
Message-ID: <xmqqk2jt36u8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1461079290-6523-1-git-send-email-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

> Thanks Jeff for pointing out issues in the comment!
>
> Thanks,
> Stefan
>
> diff to origin/jk/diff-compact-heuristic:
> diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
> index 5a02b15..b3c6848 100644
> --- a/xdiff/xdiffi.c
> +++ b/xdiff/xdiffi.c
> @@ -515,12 +515,12 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
>  		}
>  
>  		/*
> -		 * If a group can be moved back and forth, see if there is an
> +		 * If a group can be moved back and forth, see if there is a
>  		 * blank line in the moving space. If there is a blank line,
>  		 * make sure the last blank line is the end of the group.

I guess this is mine to blame.  Thanks for catching and rerolling.

Will re-queue.