From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 22 Aug 2016 11:22:41 +0000 (+0200)
Subject: xdl_change_compact(): only use heuristic if group can't be matched
X-Git-Tag: v2.11.0-rc0~115^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cb0eded863c62a38e39da7921373fc5be29846cc?ds=inline;hp=cb0eded863c62a38e39da7921373fc5be29846cc

xdl_change_compact(): only use heuristic if group can't be matched

If the changed group of lines can be matched to a group in the other
file, then that positioning should take precedence over the compaction
heuristic.

The old code tried the heuristic unconditionally, which cost redundant
effort and also was broken if the matching code had already shifted the
group higher than the blank line.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---