From 01d8e3f82adb382fb90af15879f722e824834c84 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jan 2020 11:31:27 +0000 Subject: [PATCH 4/6] Remove configure from .gitattributes. It's not a binary file. --- .gitattributes | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 200eb49c6..d871764de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,10 +29,6 @@ /boot/menhir/parser.ml* -diff -# configure is declared as binary so that it doesn't get included in diffs. -# This also means it will have the correct Unix line-endings, even on Windows. -/configure binary - # 'union' merge driver just unions textual content in case of conflict # http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ /.mailmap merge=union -- 2.32.0