Sync bootstrap from gnulib

diff --git a/bootstrap b/bootstrap
index 1b52e5e7b19311d9ba8bdadc1a96a0ef9d069dc0..19f9424bb6204b9acf90c62faa606c165559cd8e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
 
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-scriptlibversion=2025-11-12.14; # UTC
+scriptlibversion=2025-12-04.19; # UTC
 
 # Copyright (C) 2003-2026 Free Software Foundation, Inc.
 #
@@ -861,7 +861,8 @@ autopull()
     elif check_exists git-merge-changelog; then
       echo "$0: initializing git-merge-changelog driver"
       git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
-      git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B "%Y"'
+      git config merge.merge-changelog.driver \
+          'git-merge-changelog %O %A %B "%Y"'
     else
       echo "$0: consider installing git-merge-changelog from gnulib"
     fi