Merge pull request #9847 from dra27/no-configure
Don't display configure diffs in Pull Requestsmaster
commit
fa577c377c
|
@ -29,9 +29,9 @@
|
|||
|
||||
/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
|
||||
# configure is a shell-script; the linguist-generated attribute suppresses
|
||||
# changes being displayed by default in pull requests.
|
||||
/configure text eol=lf -diff linguist-generated
|
||||
|
||||
# 'union' merge driver just unions textual content in case of conflict
|
||||
# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
|
||||
|
|
|
@ -2811,7 +2811,7 @@ instrumented_runtime_ldlibs=""
|
|||
## Source directory
|
||||
|
||||
|
||||
## Directory containing auxiliary scripts used dugring build
|
||||
## Directory containing auxiliary scripts used during build
|
||||
ac_aux_dir=
|
||||
for ac_dir in build-aux "$srcdir"/build-aux; do
|
||||
if test -f "$ac_dir/install-sh"; then
|
||||
|
|
|
@ -68,7 +68,7 @@ instrumented_runtime_ldlibs=""
|
|||
## Source directory
|
||||
AC_CONFIG_SRCDIR([runtime/interp.c])
|
||||
|
||||
## Directory containing auxiliary scripts used dugring build
|
||||
## Directory containing auxiliary scripts used during build
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
## Output variables
|
||||
|
|
Loading…
Reference in New Issue