Carlos Martín Nieto <cmn@xxxxxxx> writes: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto <cmn@xxxxxxx> > --- > Documentation/diff-heuristic-options.txt | 5 ----- > Documentation/diff-options.txt | 7 ++++++- > 2 files changed, 6 insertions(+), 6 deletions(-) > delete mode 100644 Documentation/diff-heuristic-options.txt I suspect that this patch is incomplete. The build procedure barfs and dies while making git-annotate.html, claiming that it wants to find diff-heuristic-options.txt that no longer exists. I'll have to redo today's integration cycle again without this patch. Sigh...
