From bd207710031903c5a242a4ae1407027f95de33db Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 23 Jan 2026 16:00:09 -0800 Subject: [PATCH] Sync bootstrap from gnulib --- bootstrap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index 1b52e5e7..19f9424b 100755 --- 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