Diff of the two buildlogs:

--
--- b1/build.log	2024-05-30 17:24:56.780100350 +0000
+++ b2/build.log	2024-05-30 17:26:29.232170599 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Thu May 30 05:20:52 -12 2024
-I: pbuilder-time-stamp: 1717089652
+I: Current time: Thu Jul  3 13:48:00 +14 2025
+I: pbuilder-time-stamp: 1751500080
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -28,54 +28,86 @@
 dpkg-source: info: applying tox-4-pr-204.patch
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/4284/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos16-i386.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Jul  2 23:48 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='i386'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=11 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='i386'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="21" [3]="1" [4]="release" [5]="i686-pc-linux-gnu")
+  BASH_VERSION='5.2.21(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=i386
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=21 '
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=i686
+  HOST_ARCH=i386
   IFS=' 	
   '
-  INVOCATION_ID='f17aa5d33d2c4985bd55ffb3c3d1e43c'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  LD_LIBRARY_PATH='/usr/lib/libeatmydata'
-  LD_PRELOAD='libeatmydata.so'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='4284'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=d47d279b7cf042dfaf6479e8f513f528
+  LANG=C
+  LANGUAGE=de_CH:de
+  LC_ALL=C
+  LD_LIBRARY_PATH=/usr/lib/libeatmydata
+  LD_PRELOAD=libeatmydata.so
+  MACHTYPE=i686-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=114137
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.081t2NFG/pbuilderrc_iWfb --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.081t2NFG/b1 --logfile b1/build.log git-imerge_1.2.0-5.dsc'
-  SUDO_GID='112'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://46.16.76.132:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.081t2NFG/pbuilderrc_HdJV --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.081t2NFG/b2 --logfile b2/build.log git-imerge_1.2.0-5.dsc'
+  SUDO_GID=112
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://213.165.73.152:3128
 I: uname -a
-  Linux ionos12-i386 6.1.0-21-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.90-1 (2024-05-03) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-21-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.90-1 (2024-05-03) x86_64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 May 28 11:25 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/4284/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Jun 29 17:46 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -217,7 +249,7 @@
 Get: 88 http://deb.debian.org/debian trixie/main i386 python3-virtualenv all 20.26.2+ds-1 [70.8 kB]
 Get: 89 http://deb.debian.org/debian trixie/main i386 python3-wheel all 0.43.0-1 [52.5 kB]
 Get: 90 http://deb.debian.org/debian trixie/main i386 tox all 4.15.0-2 [375 kB]
-Fetched 45.6 MB in 1s (49.8 MB/s)
+Fetched 45.6 MB in 1s (88.3 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libpython3.11-minimal:i386.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19684 files and directories currently installed.)
@@ -523,8 +555,8 @@
 Setting up tzdata (2024a-4) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Thu May 30 17:21:34 UTC 2024.
-Universal Time is now:  Thu May 30 17:21:34 UTC 2024.
+Local time is now:      Wed Jul  2 23:48:21 UTC 2025.
+Universal Time is now:  Wed Jul  2 23:48:21 UTC 2025.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17029-2) ...
@@ -611,7 +643,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/git-imerge-1.2.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../git-imerge_1.2.0-5_source.changes
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-imerge-1.2.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../git-imerge_1.2.0-5_source.changes
 dpkg-buildpackage: info: source package git-imerge
 dpkg-buildpackage: info: source version 1.2.0-5
 dpkg-buildpackage: info: source distribution unstable
@@ -703,21 +739,21 @@
 I: pybuild base:311: cd /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.11/build; tox -c /build/reproducible-path/git-imerge-1.2.0/tox.ini --sitepackages -e py311 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --installpkg /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.11/git_imerge-1.2.0-py3-none-any.whl 
 py311: install_package .pybuild/cpython3_3.11/build> python -I -m pip install --force-reinstall --no-deps /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.11/git_imerge-1.2.0-py3-none-any.whl
 py311: commands[0] .pybuild/cpython3_3.11/build> /bin/sh t/test-unconflicted
-+ dirname t/test-unconflicted
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-unconflicted
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
-+ DESCRIPTION=git-imerge test repository without conflicts
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted git-imerge test repository without conflicts
++ DESCRIPTION='git-imerge test repository without conflicts'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
-+ local description=git-imerge test repository without conflicts
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted git-imerge test repository without conflicts
++ local 'description=git-imerge test repository without conflicts'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted 'git-imerge test repository without conflicts'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
-+ local description=git-imerge test repository without conflicts
++ local 'description=git-imerge test repository without conflicts'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
@@ -732,9 +768,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git/
-+ echo git-imerge test repository without conflicts
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name Loú User
++ echo 'git-imerge test repository without conflicts'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted
@@ -749,147 +785,188 @@
 + text=0
 + echo 0
 + git add b.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) 780ddf5] m⇒0
  2 files changed, 2 insertions(+)
  create mode 100644 a.txt
  create mode 100644 b.txt
 + git checkout -b a --
 Switched to a new branch 'a'
-+ seq 8
+++ seq 8
++ for i in $(seq 8)
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1
++ commit -m $'a\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'a\342\207\2221'
+[a b862e30] a⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-[a b862e30] a⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m a⇒2
++ commit -m $'a\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'a\342\207\2222'
 [a dcbe282] a⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3
++ commit -m $'a\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'a\342\207\2223'
+[a ecd8647] a⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 4
 + filename=a.txt
 + text=4
 + echo 4
 + git add a.txt
-[a ecd8647] a⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ commit -m $'a\342\207\2224'
++ TIME=1112911998
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'a\342\207\2224'
 [a 1634bab] a⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m a⇒4
-+ TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4
++ for i in $(seq 8)
 + modify a.txt 5
 + filename=a.txt
 + text=5
 + echo 5
 + git add a.txt
-+ commit -m a⇒5
++ commit -m $'a\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'a\342\207\2225'
 [a 909ce12] a⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 6
 + filename=a.txt
 + text=6
 + echo 6
 + git add a.txt
-+ commit -m a⇒6
++ commit -m $'a\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'a\342\207\2226'
+[a f6520bf] a⇒6
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 7
 + filename=a.txt
 + text=7
 + echo 7
 + git add a.txt
-[a f6520bf] a⇒6
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m a⇒7
++ commit -m $'a\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'a\342\207\2227'
+[a 6797186] a⇒7
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 8)
 + modify a.txt 8
 + filename=a.txt
 + text=8
 + echo 8
-[a 6797186] a⇒7
- 1 file changed, 1 insertion(+), 1 deletion(-)
 + git add a.txt
-+ commit -m a⇒8
++ commit -m $'a\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m a⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'a\342\207\2228'
 [a 49643dd] a⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b b master --
 Switched to a new branch 'b'
-+ seq 5
+++ seq 5
++ for i in $(seq 5)
 + modify b.txt 1
 + filename=b.txt
 + text=1
 + echo 1
 + git add b.txt
-+ commit -m b⇒1
++ commit -m $'b\342\207\2221'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m b⇒1
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'b\342\207\2221'
 [b d43305b] b⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 5)
 + modify b.txt 2
 + filename=b.txt
 + text=2
 + echo 2
 + git add b.txt
-+ commit -m b⇒2
++ commit -m $'b\342\207\2222'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m b⇒2
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'b\342\207\2222'
 [b 853ee68] b⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 5)
 + modify b.txt 3
 + filename=b.txt
 + text=3
 + echo 3
 + git add b.txt
-+ commit -m b⇒3
++ commit -m $'b\342\207\2223'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m b⇒3
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'b\342\207\2223'
 [b 03a2455] b⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 5)
 + modify b.txt 4
 + filename=b.txt
 + text=4
 + echo 4
 + git add b.txt
-+ commit -m b⇒4
++ commit -m $'b\342\207\2224'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m b⇒4
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'b\342\207\2224'
+[b 484ea85] b⇒4
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 5)
 + modify b.txt 5
 + filename=b.txt
 + text=5
 + echo 5
 + git add b.txt
-[b 484ea85] b⇒4
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m b⇒5
++ commit -m $'b\342\207\2225'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m b⇒5
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'b\342\207\2225'
 [b e22cd97] b⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
 + EXPECTED_TREE=e4a7b27799be355bbcbf8bfe9c29d74190082c42
@@ -946,54 +1023,55 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=a-b-merge
 Merge b into a (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:22:17 2024 +0000
+# Date:      Wed Jul 2 23:48:35 2025 +0000
 #
 # On branch a-b-merge
 # Changes to be committed:
 #	modified:   b.txt
 #
-[a-b-merge d81d83d] Merge b into a (using imerge)
- Date: Thu May 30 17:22:17 2024 +0000
+[a-b-merge ba1d850] Merge b into a (using imerge)
+ Date: Wed Jul 2 23:48:35 2025 +0000
 + check_tree a-b-merge e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-merge
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-merge^{tree}
+++ git rev-parse 'a-b-merge^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge simplify --goal=rebase --branch=a-b-rebase
 + check_tree a-b-rebase e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-rebase
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-rebase^{tree}
+++ git rev-parse 'a-b-rebase^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history
 + check_tree a-b-rebase-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-rebase-with-history
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-rebase-with-history^{tree}
+++ git rev-parse 'a-b-rebase-with-history^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge simplify --goal=border --branch=a-b-border
 + check_tree a-b-border e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-border
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-border^{tree}
+++ git rev-parse 'a-b-border^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history
 + check_tree a-b-border-with-history e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-border-with-history
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-border-with-history^{tree}
+++ git rev-parse 'a-b-border-with-history^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge simplify --goal=border-with-history2 --branch=a-b-border-with-history2
 + check_tree a-b-border-with-history2 e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-border-with-history2
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-border-with-history2^{tree}
+++ git rev-parse 'a-b-border-with-history2^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + git-imerge remove
 + git checkout a
@@ -1077,13 +1155,13 @@
 + check_tree a-b-full e4a7b27799be355bbcbf8bfe9c29d74190082c42
 + local refname=a-b-full
 + local expected_tree=e4a7b27799be355bbcbf8bfe9c29d74190082c42
-+ git rev-parse a-b-full^{tree}
+++ git rev-parse 'a-b-full^{tree}'
 + test e4a7b27799be355bbcbf8bfe9c29d74190082c42 = e4a7b27799be355bbcbf8bfe9c29d74190082c42
 py311: commands[1] .pybuild/cpython3_3.11/build> /bin/sh t/test-conflicted
-+ dirname t/test-conflicted
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-conflicted
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
@@ -1091,17 +1169,16 @@
 + test_conflict 4-3
 + local conflict=4-3
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
-+ DESCRIPTION=git-imerge test repository with conflict at 4-3
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3
++ DESCRIPTION='git-imerge test repository with conflict at 4-3'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
-+ local description=git-imerge test repository with conflict at 4-3
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 git-imerge test repository with conflict at 4-3
++ local 'description=git-imerge test repository with conflict at 4-3'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3 'git-imerge test repository with conflict at 4-3'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
-+ local description=git-imerge test repository with conflict at 4-3
++ local 'description=git-imerge test repository with conflict at 4-3'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
-Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/
 hint: Using 'master' as the name for the initial branch. This default branch name
 hint: is subject to change. To configure the initial branch name to use in all
 hint: of your new repositories, which will suppress this warning, call:
@@ -1112,9 +1189,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with conflict at 4-3
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name Loú User
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/
++ echo 'git-imerge test repository with conflict at 4-3'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3
@@ -1129,14 +1207,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -1144,168 +1224,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
+[c 89e2141] c⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
-[c 89e2141] c⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
-[c f02ab24] c⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
+[c f02ab24] c⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒4
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c 3c091de] c⇒4
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
+[c a0ac37a] c⇒5
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
-[c a0ac37a] c⇒5
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c ed9fdfa] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 1da7bf5] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
+[c d8de99f] c⇒8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
-[c d8de99f] c⇒8
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 9cde605] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
+[d bd5368a] d⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
-[d bd5368a] d⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 93e27e6] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒3
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 2bb1a7e] d⇒3
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 81f9c80] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 3690dde] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ commit -m d⇒6
++ case $conflict in
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d 8085853] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout c
@@ -1387,7 +1527,7 @@
 HEAD is now at 9cde605 c⇒9
 Conflict; suggest manual merge of 4-3
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 4-3 autofill.out
++ grep -q 'suggest manual merge of 4-3' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -1435,20 +1575,20 @@
     c⇒4
 
 Original second commit:
-
-There was a conflict merging commit 4-3, shown above.
-Please resolve the conflict, commit the result, then type
-
-    git-imerge continue
 commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:26 2005 +0000
 
     d⇒3
-+ echo merged version
+
+There was a conflict merging commit 4-3, shown above.
+Please resolve the conflict, commit the result, then type
+
+    git-imerge continue
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 2576f4b] imerge 'c-d': manual merge 4-3
+[imerge/c-d 945c011] imerge 'c-d': manual merge 4-3
 Merge has been recorded for merge 4-3.
 Attempting automerge of 4-6...success.
 Autofilling 4-4...success.
@@ -1501,61 +1641,62 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:22:32 2024 +0000
+# Date:      Wed Jul 2 23:48:39 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 35d4bac] Merge d into c (using imerge)
- Date: Thu May 30 17:22:32 2024 +0000
+[c-d-merge 085f45b] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:39 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
 Switched to branch 'c'
-+ tee start.out
 + git-imerge start --goal=full --first-parent --name=c-d d
++ tee start.out
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -1587,7 +1728,7 @@
 Attempting to merge 8-2...success.
 Attempting to merge 9-1...success.
 Attempting to merge 9-2...success.
-Previous HEAD position was 6af7a7a imerge 'c-d': automatic merge 9-2
+Previous HEAD position was 36d22e0 imerge 'c-d': automatic merge 9-2
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -1612,7 +1753,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 4-3 autofill.out
++ grep -q 'suggest manual merge of 4-3' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -1646,9 +1787,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 4-3
 
 # Conflicts:
@@ -1670,8 +1812,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
+[imerge/c-d b23ed65] imerge 'c-d': manual merge 4-3
 + git-imerge continue --edit
-[imerge/c-d 2c62ce0] imerge 'c-d': manual merge 4-3
 Merge has been recorded for merge 4-3.
 Attempting to merge 4-4...success.
 Attempting to merge 4-5...success.
@@ -1734,18 +1876,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 1-1
 + local conflict=1-1
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
-+ DESCRIPTION=git-imerge test repository with conflict at 1-1
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1
++ DESCRIPTION='git-imerge test repository with conflict at 1-1'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
-+ local description=git-imerge test repository with conflict at 1-1
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 git-imerge test repository with conflict at 1-1
++ local 'description=git-imerge test repository with conflict at 1-1'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1 'git-imerge test repository with conflict at 1-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
-+ local description=git-imerge test repository with conflict at 1-1
++ local 'description=git-imerge test repository with conflict at 1-1'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
@@ -1759,10 +1901,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with conflict at 1-1
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name Loú User
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git/
++ echo 'git-imerge test repository with conflict at 1-1'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1
@@ -1777,14 +1919,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -1792,168 +1936,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒1
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
+[c 2120f40] c⇒1
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
-[c 2120f40] c⇒1
- 2 files changed, 2 insertions(+), 2 deletions(-)
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 90cc7de] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c 2046ed2] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c 8a2cee9] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c ac16a05] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c 30dd2ae] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
+[c 0883eb9] c⇒7
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-[c 0883eb9] c⇒7
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c f661c06] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 243e8ed] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒1
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d ac0427a] d⇒1
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 43c38c0] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 0260058] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
+[d 40fef44] d⇒4
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-[d 40fef44] d⇒4
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ case $conflict in
++ commit -m $'d\342\207\2225'
++ TIME=1112912008
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d b080a65] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒5
-+ TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ commit -m d⇒6
++ case $conflict in
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d 200ce5c] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout c
@@ -1994,14 +2198,14 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ + tee autofill.out
-git-imerge autofill
++ git-imerge autofill
++ tee autofill.out
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...failure.
 HEAD is now at 243e8ed c⇒9
 No progress was possible; suggest manual merge of 1-1
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 1-1 autofill.out
++ grep -q 'suggest manual merge of 1-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -2059,10 +2263,10 @@
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 0525354] imerge 'c-d': manual merge 1-1
+[imerge/c-d 94997f3] imerge 'c-d': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting automerge of 1-6...success.
 Autofilling 1-2...success.
@@ -2122,55 +2326,56 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:22:44 2024 +0000
+# Date:      Wed Jul 2 23:48:42 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 9a8fbed] Merge d into c (using imerge)
- Date: Thu May 30 17:22:44 2024 +0000
+[c-d-merge fb98c68] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:42 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
@@ -2202,7 +2407,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 1-1 autofill.out
++ grep -q 'suggest manual merge of 1-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -2236,9 +2441,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 1-1
 
 # Conflicts:
@@ -2260,8 +2466,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
+[imerge/c-d 6d95564] imerge 'c-d': manual merge 1-1
 + git-imerge continue --edit
-[imerge/c-d 77fc619] imerge 'c-d': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -2354,18 +2560,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 9-1
 + local conflict=9-1
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
-+ DESCRIPTION=git-imerge test repository with conflict at 9-1
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1
++ DESCRIPTION='git-imerge test repository with conflict at 9-1'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
-+ local description=git-imerge test repository with conflict at 9-1
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 git-imerge test repository with conflict at 9-1
++ local 'description=git-imerge test repository with conflict at 9-1'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1 'git-imerge test repository with conflict at 9-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
-+ local description=git-imerge test repository with conflict at 9-1
++ local 'description=git-imerge test repository with conflict at 9-1'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
@@ -2380,9 +2586,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git/
-+ echo git-imerge test repository with conflict at 9-1
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name Loú User
++ echo 'git-imerge test repository with conflict at 9-1'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
@@ -2397,14 +2603,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -2412,168 +2620,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 89e2141] c⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
-[c f02ab24] c⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
+[c f02ab24] c⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
+[c 1d3bf09] c⇒5
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-[c 1d3bf09] c⇒5
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c f999ecd] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 7050a8a] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c 9732e77] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒9
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 73a5eed] c⇒9
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
++ commit -m $'d\342\207\2221'
++ TIME=1112912004
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d ac0427a] d⇒1
  2 files changed, 2 insertions(+), 2 deletions(-)
-+ commit -m d⇒1
-+ TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 43c38c0] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 0260058] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 40fef44] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d b080a65] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ commit -m d⇒6
++ case $conflict in
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d 200ce5c] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout c
@@ -2614,8 +2882,8 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ tee autofill.out
 + git-imerge autofill
++ tee autofill.out
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...success.
 Attempting automerge of 1-4...success.
@@ -2646,7 +2914,7 @@
 HEAD is now at 73a5eed c⇒9
 Conflict; suggest manual merge of 9-1
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 9-1 autofill.out
++ grep -q 'suggest manual merge of 9-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -2687,27 +2955,27 @@
 Automatic merge failed; fix conflicts and then commit the result.
 
 Original first commit:
-
-Original second commit:
 commit 73a5eedb087a0f656d730831b8def7943b40f3cf
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:23 2005 +0000
 
     c⇒9
 
-There was a conflict merging commit 9-1, shown above.
-Please resolve the conflict, commit the result, then type
-
-    git-imerge continue
+Original second commit:
 commit ac0427a285b64f2815ebd6eb83880f309600d0c7
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:24 2005 +0000
 
     d⇒1
-+ echo merged version
+
+There was a conflict merging commit 9-1, shown above.
+Please resolve the conflict, commit the result, then type
+
+    git-imerge continue
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d bef2a09] imerge 'c-d': manual merge 9-1
+[imerge/c-d 883db38] imerge 'c-d': manual merge 9-1
 Merge has been recorded for merge 9-1.
 Attempting automerge of 9-6...success.
 Autofilling 9-2...success.
@@ -2750,61 +3018,62 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:22:56 2024 +0000
+# Date:      Wed Jul 2 23:48:45 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge abe218c] Merge d into c (using imerge)
- Date: Thu May 30 17:22:56 2024 +0000
+[c-d-merge 0aabb06] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:45 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
 Switched to branch 'c'
-+ tee start.out
 + git-imerge start --goal=full --first-parent --name=c-d d
++ tee start.out
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -2878,7 +3147,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 9-1 autofill.out
++ grep -q 'suggest manual merge of 9-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -2912,9 +3181,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 9-1
 
 # Conflicts:
@@ -2936,8 +3206,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
+[imerge/c-d 0f30a9a] imerge 'c-d': manual merge 9-1
 + git-imerge continue --edit
-[imerge/c-d 2e73d0e] imerge 'c-d': manual merge 9-1
 Merge has been recorded for merge 9-1.
 Attempting to merge 9-2...success.
 Attempting to merge 9-3...success.
@@ -2982,18 +3252,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 1-6
 + local conflict=1-6
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
-+ DESCRIPTION=git-imerge test repository with conflict at 1-6
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6
++ DESCRIPTION='git-imerge test repository with conflict at 1-6'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
-+ local description=git-imerge test repository with conflict at 1-6
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 git-imerge test repository with conflict at 1-6
++ local 'description=git-imerge test repository with conflict at 1-6'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6 'git-imerge test repository with conflict at 1-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
-+ local description=git-imerge test repository with conflict at 1-6
++ local 'description=git-imerge test repository with conflict at 1-6'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
@@ -3007,9 +3277,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with conflict at 1-6
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name Loú User
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/
++ echo 'git-imerge test repository with conflict at 1-6'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6
@@ -3024,15 +3295,16 @@
 + text=0
 + echo 0
 + git add d.txt
-Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.git/
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -3040,168 +3312,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒1
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 2120f40] c⇒1
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 90cc7de] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c 2046ed2] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c 8a2cee9] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
++ case $conflict in
++ commit -m $'c\342\207\2225'
++ TIME=1112911999
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c ac16a05] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m c⇒5
-+ TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c 30dd2ae] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 0883eb9] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c f661c06] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
-+ git checkout -b d master --
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 243e8ed] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
++ git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
+[d bd5368a] d⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-[d bd5368a] d⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 93e27e6] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 133f385] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 586472a] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 9522207] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒6
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d f7e451a] d⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout c
@@ -3242,8 +3574,8 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ tee autofill.out
 + git-imerge autofill
++ tee autofill.out
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...success.
 Attempting automerge of 1-4...success.
@@ -3271,7 +3603,7 @@
 HEAD is now at 243e8ed c⇒9
 Conflict; suggest manual merge of 1-6
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 1-6 autofill.out
++ grep -q 'suggest manual merge of 1-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -3312,27 +3644,27 @@
 Automatic merge failed; fix conflicts and then commit the result.
 
 Original first commit:
-
-Original second commit:
 commit 2120f40dc39d28052a5279b645124e8ed7e5de73
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:15 2005 +0000
 
     c⇒1
 
-There was a conflict merging commit 1-6, shown above.
-Please resolve the conflict, commit the result, then type
-
-    git-imerge continue
+Original second commit:
 commit f7e451a6c9656dda15641a9fbc591a602f158692
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:29 2005 +0000
 
     d⇒6
-+ echo merged version
+
+There was a conflict merging commit 1-6, shown above.
+Please resolve the conflict, commit the result, then type
+
+    git-imerge continue
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 4126b36] imerge 'c-d': manual merge 1-6
+[imerge/c-d 1c40155] imerge 'c-d': manual merge 1-6
 Merge has been recorded for merge 1-6.
 Attempting automerge of 9-6...success.
 Autofilling 2-6...success.
@@ -3378,55 +3710,56 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:05 2024 +0000
+# Date:      Wed Jul 2 23:48:49 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 6512381] Merge d into c (using imerge)
- Date: Thu May 30 17:23:05 2024 +0000
+[c-d-merge ac08e10] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:49 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
@@ -3479,7 +3812,7 @@
 Attempting to merge 9-3...success.
 Attempting to merge 9-4...success.
 Attempting to merge 9-5...success.
-Previous HEAD position was f8f0910 imerge 'c-d': automatic merge 9-5
+Previous HEAD position was 1962ab1 imerge 'c-d': automatic merge 9-5
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -3504,7 +3837,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 1-6 autofill.out
++ grep -q 'suggest manual merge of 1-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -3538,9 +3871,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 1-6
 
 # Conflicts:
@@ -3562,7 +3896,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d d13de6b] imerge 'c-d': manual merge 1-6
+[imerge/c-d ef34ea9] imerge 'c-d': manual merge 1-6
 + git-imerge continue --edit
 Merge has been recorded for merge 1-6.
 Attempting to merge 2-6...success.
@@ -3611,18 +3945,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 9-6
 + local conflict=9-6
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
-+ DESCRIPTION=git-imerge test repository with conflict at 9-6
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6
++ DESCRIPTION='git-imerge test repository with conflict at 9-6'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
-+ local description=git-imerge test repository with conflict at 9-6
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 git-imerge test repository with conflict at 9-6
++ local 'description=git-imerge test repository with conflict at 9-6'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6 'git-imerge test repository with conflict at 9-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
-+ local description=git-imerge test repository with conflict at 9-6
++ local 'description=git-imerge test repository with conflict at 9-6'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
@@ -3637,9 +3971,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git/
-+ echo git-imerge test repository with conflict at 9-6
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name Loú User
++ echo 'git-imerge test repository with conflict at 9-6'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-6
@@ -3654,183 +3988,245 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
-+ git checkout -b c master --
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
  create mode 100644 conflict.txt
  create mode 100644 d.txt
++ git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 89e2141] c⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c f02ab24] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c 1d3bf09] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c f999ecd] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 7050a8a] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c 9732e77] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒9
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 73a5eed] c⇒9
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d bd5368a] d⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 93e27e6] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
+[d 133f385] d⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
-[d 133f385] d⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 586472a] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 9522207] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒6
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d f7e451a] d⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout c
@@ -3911,7 +4307,7 @@
 HEAD is now at 73a5eed c⇒9
 Conflict; suggest manual merge of 9-6
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 9-6 autofill.out
++ grep -q 'suggest manual merge of 9-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -3957,22 +4353,22 @@
 Date:   Thu Apr 7 22:13:23 2005 +0000
 
     c⇒9
+
+Original second commit:
 commit f7e451a6c9656dda15641a9fbc591a602f158692
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:29 2005 +0000
 
     d⇒6
 
-Original second commit:
-
 There was a conflict merging commit 9-6, shown above.
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 67cd4f9] imerge 'c-d': manual merge 9-6
+[imerge/c-d 083ebc0] imerge 'c-d': manual merge 9-6
 Merge has been recorded for merge 9-6.
 Merge is complete!
 + git-imerge diagram --commits --frontier --html=imerge2.html
@@ -4008,55 +4404,56 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:15 2024 +0000
+# Date:      Wed Jul 2 23:48:52 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge eaa17ec] Merge d into c (using imerge)
- Date: Thu May 30 17:23:15 2024 +0000
+[c-d-merge 16a35a0] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:52 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
@@ -4141,7 +4538,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 9-6 autofill.out
++ grep -q 'suggest manual merge of 9-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -4175,9 +4572,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 9-6
 
 # Conflicts:
@@ -4199,7 +4597,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 577abbf] imerge 'c-d': manual merge 9-6
+[imerge/c-d a6dc320] imerge 'c-d': manual merge 9-6
 + git-imerge continue --edit
 Merge has been recorded for merge 9-6.
 Merge is complete!
@@ -4240,18 +4638,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 1-2
 + local conflict=1-2
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
-+ DESCRIPTION=git-imerge test repository with conflict at 1-2
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2
++ DESCRIPTION='git-imerge test repository with conflict at 1-2'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
-+ local description=git-imerge test repository with conflict at 1-2
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 git-imerge test repository with conflict at 1-2
++ local 'description=git-imerge test repository with conflict at 1-2'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2 'git-imerge test repository with conflict at 1-2'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
-+ local description=git-imerge test repository with conflict at 1-2
++ local 'description=git-imerge test repository with conflict at 1-2'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
@@ -4266,9 +4664,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/
-+ echo git-imerge test repository with conflict at 1-2
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name Loú User
++ echo 'git-imerge test repository with conflict at 1-2'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
@@ -4283,14 +4681,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -4298,168 +4698,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒1
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 2120f40] c⇒1
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 90cc7de] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c 2046ed2] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c 8a2cee9] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c ac16a05] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c 30dd2ae] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 0883eb9] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c f661c06] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 243e8ed] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d bd5368a] d⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒2
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 69efde8] d⇒2
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 3169557] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 86c8052] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 1700773] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ commit -m d⇒6
++ case $conflict in
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d df2e493] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout c
@@ -4500,8 +4960,8 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ + git-imerge autofill
-tee autofill.out
++ git-imerge autofill
++ tee autofill.out
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...success.
 Attempting automerge of 1-4...failure.
@@ -4523,7 +4983,7 @@
 HEAD is now at 243e8ed c⇒9
 Conflict; suggest manual merge of 1-2
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 1-2 autofill.out
++ grep -q 'suggest manual merge of 1-2' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -4559,11 +5019,11 @@
 
 + git-imerge continue --edit
 Switched to branch 'imerge/c-d'
-
-Original first commit:
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
 Automatic merge failed; fix conflicts and then commit the result.
+
+Original first commit:
 commit 2120f40dc39d28052a5279b645124e8ed7e5de73
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:15 2005 +0000
@@ -4581,10 +5041,10 @@
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 2aa7c0e] imerge 'c-d': manual merge 1-2
+[imerge/c-d 6a8ed6e] imerge 'c-d': manual merge 1-2
 Merge has been recorded for merge 1-2.
 Attempting automerge of 1-6...success.
 Autofilling 1-3...success.
@@ -4642,55 +5102,56 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:23 2024 +0000
+# Date:      Wed Jul 2 23:48:55 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 4598319] Merge d into c (using imerge)
- Date: Thu May 30 17:23:23 2024 +0000
+[c-d-merge e4ca8cc] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:55 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
@@ -4707,7 +5168,7 @@
 Attempting to merge 7-1...success.
 Attempting to merge 8-1...success.
 Attempting to merge 9-1...success.
-Previous HEAD position was b7b92b3 imerge 'c-d': automatic merge 9-1
+Previous HEAD position was d9ca441 imerge 'c-d': automatic merge 9-1
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -4732,7 +5193,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 1-2 autofill.out
++ grep -q 'suggest manual merge of 1-2' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -4766,9 +5227,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 1-2
 
 # Conflicts:
@@ -4790,7 +5252,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 3bf4d99] imerge 'c-d': manual merge 1-2
+[imerge/c-d cd381df] imerge 'c-d': manual merge 1-2
 + git-imerge continue --edit
 Merge has been recorded for merge 1-2.
 Attempting to merge 1-3...success.
@@ -4875,18 +5337,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 9-5
 + local conflict=9-5
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
-+ DESCRIPTION=git-imerge test repository with conflict at 9-5
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5
++ DESCRIPTION='git-imerge test repository with conflict at 9-5'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
-+ local description=git-imerge test repository with conflict at 9-5
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 git-imerge test repository with conflict at 9-5
++ local 'description=git-imerge test repository with conflict at 9-5'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5 'git-imerge test repository with conflict at 9-5'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
-+ local description=git-imerge test repository with conflict at 9-5
++ local 'description=git-imerge test repository with conflict at 9-5'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
@@ -4901,9 +5363,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git/
-+ echo git-imerge test repository with conflict at 9-5
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name Loú User
++ echo 'git-imerge test repository with conflict at 9-5'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5
@@ -4918,14 +5380,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -4933,170 +5397,230 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 89e2141] c⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c f02ab24] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c 1d3bf09] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ commit -m c⇒6
++ case $conflict in
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c f999ecd] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c 7050a8a] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
+[c 9732e77] c⇒8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-[c 9732e77] c⇒8
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒9
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 73a5eed] c⇒9
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d bd5368a] d⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
++ case $conflict in
++ commit -m $'d\342\207\2222'
++ TIME=1112912005
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 93e27e6] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒2
-+ TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
+[d 133f385] d⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-[d 133f385] d⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 586472a] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒5
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
-+ modify d.txt 6
-+ filename=d.txt
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 0a6f956] d⇒5
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 6)
++ modify d.txt 6
++ filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
++ case $conflict in
++ commit -m $'d\342\207\2226'
++ TIME=1112912009
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d bfb30f0] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒6
-+ TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
 + git checkout c
 Switched to branch 'c'
 + git-imerge init --name=c-d d
@@ -5135,8 +5659,8 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ tee autofill.out
 + git-imerge autofill
++ tee autofill.out
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...success.
 Attempting automerge of 1-4...success.
@@ -5174,7 +5698,7 @@
 HEAD is now at 73a5eed c⇒9
 Conflict; suggest manual merge of 9-5
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 9-5 autofill.out
++ grep -q 'suggest manual merge of 9-5' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -5220,22 +5744,22 @@
 Date:   Thu Apr 7 22:13:23 2005 +0000
 
     c⇒9
+
+Original second commit:
 commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:28 2005 +0000
 
     d⇒5
 
-Original second commit:
-
 There was a conflict merging commit 9-5, shown above.
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d 3326cb6] imerge 'c-d': manual merge 9-5
+[imerge/c-d d8c1604] imerge 'c-d': manual merge 9-5
 Merge has been recorded for merge 9-5.
 Attempting automerge of 9-6...success.
 Autofilling 9-6...success.
@@ -5274,61 +5798,62 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:32 2024 +0000
+# Date:      Wed Jul 2 23:48:59 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 0c44f98] Merge d into c (using imerge)
- Date: Thu May 30 17:23:32 2024 +0000
+[c-d-merge 8fb200b] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:48:59 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
 Switched to branch 'c'
-+ tee start.out
 + git-imerge start --goal=full --first-parent --name=c-d d
++ tee start.out
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -5406,7 +5931,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 9-5 autofill.out
++ grep -q 'suggest manual merge of 9-5' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -5440,9 +5965,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 9-5
 
 # Conflicts:
@@ -5464,8 +5990,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
+[imerge/c-d 05561f9] imerge 'c-d': manual merge 9-5
 + git-imerge continue --edit
-[imerge/c-d f32734f] imerge 'c-d': manual merge 9-5
 Merge has been recorded for merge 9-5.
 Attempting to merge 9-6...success.
 Merge is complete!
@@ -5506,18 +6032,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 5-1
 + local conflict=5-1
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
-+ DESCRIPTION=git-imerge test repository with conflict at 5-1
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1
++ DESCRIPTION='git-imerge test repository with conflict at 5-1'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
-+ local description=git-imerge test repository with conflict at 5-1
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 git-imerge test repository with conflict at 5-1
++ local 'description=git-imerge test repository with conflict at 5-1'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1 'git-imerge test repository with conflict at 5-1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
-+ local description=git-imerge test repository with conflict at 5-1
++ local 'description=git-imerge test repository with conflict at 5-1'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
@@ -5531,11 +6057,11 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with conflict at 5-1
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name Loú User
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.email luser@example.com
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git/
++ echo 'git-imerge test repository with conflict at 5-1'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.name 'Loú User'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
 + cd /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1
@@ -5549,14 +6075,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -5564,168 +6092,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
-[c 89e2141] c⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
+[c 89e2141] c⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c f02ab24] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒5
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c 7e31f25] c⇒5
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
++ case $conflict in
++ commit -m $'c\342\207\2226'
++ TIME=1112912000
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c df3c57a] c⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m c⇒6
-+ TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c ea32d81] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
++ case $conflict in
++ commit -m $'c\342\207\2228'
++ TIME=1112912002
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
 [c 44473d6] c⇒8
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m c⇒8
-+ TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c d8d80cf] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒1
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d ac0427a] d⇒1
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
++ case $conflict in
++ commit -m $'d\342\207\2222'
++ TIME=1112912005
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 43c38c0] d⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒2
-+ TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
++ case $conflict in
++ commit -m $'d\342\207\2223'
++ TIME=1112912006
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 0260058] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒3
-+ TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 40fef44] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
-+ commit -m d⇒5
++ case $conflict in
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d b080a65] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ commit -m d⇒6
++ case $conflict in
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d 200ce5c] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout c
@@ -5794,7 +6382,7 @@
 HEAD is now at d8d80cf c⇒9
 Conflict; suggest manual merge of 5-1
 + grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 5-1 autofill.out
++ grep -q 'suggest manual merge of 5-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -5840,22 +6428,22 @@
 Date:   Thu Apr 7 22:13:19 2005 +0000
 
     c⇒5
+
+Original second commit:
 commit ac0427a285b64f2815ebd6eb83880f309600d0c7
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:24 2005 +0000
 
     d⇒1
 
-Original second commit:
-
 There was a conflict merging commit 5-1, shown above.
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d c26b15f] imerge 'c-d': manual merge 5-1
+[imerge/c-d aa31198] imerge 'c-d': manual merge 5-1
 Merge has been recorded for merge 5-1.
 Attempting automerge of 5-6...success.
 Autofilling 5-2...success.
@@ -5911,61 +6499,62 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:42 2024 +0000
+# Date:      Wed Jul 2 23:49:03 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge df340b8] Merge d into c (using imerge)
- Date: Thu May 30 17:23:42 2024 +0000
+[c-d-merge 19d5c7c] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:49:03 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
 Switched to branch 'c'
-+ tee start.out
 + git-imerge start --goal=full --first-parent --name=c-d d
++ tee start.out
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -6015,7 +6604,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 5-1 autofill.out
++ grep -q 'suggest manual merge of 5-1' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -6049,9 +6638,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 5-1
 
 # Conflicts:
@@ -6073,7 +6663,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d b4fac01] imerge 'c-d': manual merge 5-1
+[imerge/c-d d44c110] imerge 'c-d': manual merge 5-1
 + git-imerge continue --edit
 Merge has been recorded for merge 5-1.
 Attempting to merge 5-2...success.
@@ -6143,18 +6733,18 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + test_conflict 6-6
 + local conflict=6-6
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
-+ DESCRIPTION=git-imerge test repository with conflict at 6-6
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6
++ DESCRIPTION='git-imerge test repository with conflict at 6-6'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
-+ local description=git-imerge test repository with conflict at 6-6
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 git-imerge test repository with conflict at 6-6
++ local 'description=git-imerge test repository with conflict at 6-6'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6 'git-imerge test repository with conflict at 6-6'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
-+ local description=git-imerge test repository with conflict at 6-6
++ local 'description=git-imerge test repository with conflict at 6-6'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
@@ -6168,10 +6758,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with conflict at 6-6
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name Loú User
++ echo 'git-imerge test repository with conflict at 6-6'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6
@@ -6186,14 +6776,16 @@
 + text=0
 + echo 0
 + git add d.txt
-+ modify conflict.txt original version
++ modify conflict.txt 'original version'
 + filename=conflict.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) d70e04b] m⇒0
  3 files changed, 3 insertions(+)
  create mode 100644 c.txt
@@ -6201,168 +6793,228 @@
  create mode 100644 d.txt
 + git checkout -b c master --
 Switched to a new branch 'c'
-+ seq 9
+++ seq 9
++ for i in $(seq 9)
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ commit -m c⇒1
++ case $conflict in
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
+[c 89e2141] c⇒1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ case $conflict in
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
-[c 89e2141] c⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c 7c431f2] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ case $conflict in
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
 [c f02ab24] c⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
++ case $conflict in
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c 1d3bf09] c⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 6
 + filename=c.txt
 + text=6
 + echo 6
 + git add c.txt
-+ modify conflict.txt c version
++ case $conflict in
++ modify conflict.txt 'c version'
 + filename=conflict.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict.txt
-+ commit -m c⇒6
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c fe4fed8] c⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
++ case $conflict in
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c ec255ea] c⇒7
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ case $conflict in
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
+[c 7459ac3] c⇒8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
++ case $conflict in
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
-[c 7459ac3] c⇒8
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c 70408c8] c⇒9
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b d master --
 Switched to a new branch 'd'
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify d.txt 1
 + filename=d.txt
 + text=1
 + echo 1
 + git add d.txt
-+ commit -m d⇒1
++ case $conflict in
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d bd5368a] d⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
++ case $conflict in
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
+[d 93e27e6] d⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ case $conflict in
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
-[d 93e27e6] d⇒2
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
+[d 133f385] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ case $conflict in
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
-[d 133f385] d⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d 586472a] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 6)
 + modify d.txt 5
 + filename=d.txt
 + text=5
 + echo 5
 + git add d.txt
++ case $conflict in
++ commit -m $'d\342\207\2225'
++ TIME=1112912008
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
 [d 9522207] d⇒5
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m d⇒5
-+ TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ for i in $(seq 6)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ modify conflict.txt d version
++ case $conflict in
++ modify conflict.txt 'd version'
 + filename=conflict.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict.txt
-+ commit -m d⇒6
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d f7e451a] d⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout c
@@ -6444,9 +7096,9 @@
 Attempting automerge of 9-6...failure.
 Attempting automerge of 6-6...failure.
 HEAD is now at 70408c8 c⇒9
-+ grep -q Traceback autofill.out
-+ grep -q suggest manual merge of 6-6 autofill.out
 Conflict; suggest manual merge of 6-6
++ grep -q Traceback autofill.out
++ grep -q 'suggest manual merge of 6-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge1.html
        0    5   9
        |    |   |
@@ -6504,10 +7156,10 @@
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d b628cc9] imerge 'c-d': manual merge 6-6
+[imerge/c-d ebef4ff] imerge 'c-d': manual merge 6-6
 Merge has been recorded for merge 6-6.
 Attempting automerge of 9-6...success.
 Autofilling 7-6...success.
@@ -6548,61 +7200,62 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:23:53 2024 +0000
+# Date:      Wed Jul 2 23:49:07 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 6bb36b7] Merge d into c (using imerge)
- Date: Thu May 30 17:23:53 2024 +0000
+[c-d-merge 26fb00d] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:49:07 2025 +0000
 + check_tree c-d-merge ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-merge
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-rebase-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-border-with-history2
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 + git-imerge remove
 + git checkout c
 Switched to branch 'c'
-+ tee start.out
 + git-imerge start --goal=full --first-parent --name=c-d d
++ tee start.out
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -6654,7 +7307,7 @@
 Attempting to merge 9-3...success.
 Attempting to merge 9-4...success.
 Attempting to merge 9-5...success.
-Previous HEAD position was e2435b8 imerge 'c-d': automatic merge 9-5
+Previous HEAD position was 4d84da0 imerge 'c-d': automatic merge 9-5
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -6679,7 +7332,7 @@
 
     git-imerge continue
 + grep -q Traceback start.out
-+ grep -q suggest manual merge of 6-6 autofill.out
++ grep -q 'suggest manual merge of 6-6' autofill.out
 + git-imerge diagram --commits --frontier --html=imerge3.html
        0    5   9
        |    |   |
@@ -6713,9 +7366,10 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ echo merged version
++ echo 'merged version'
 + git add conflict.txt
-+ GIT_EDITOR=cat git commit
++ GIT_EDITOR=cat
++ git commit
 imerge 'c-d': manual merge 6-6
 
 # Conflicts:
@@ -6737,8 +7391,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
+[imerge/c-d 6c7c868] imerge 'c-d': manual merge 6-6
 + git-imerge continue --edit
-[imerge/c-d 4ad9fb2] imerge 'c-d': manual merge 6-6
 Merge has been recorded for merge 6-6.
 Attempting to merge 7-6...success.
 Attempting to merge 8-6...success.
@@ -6781,24 +7435,24 @@
 + check_tree c-d-full ffa191c987a8d3f597376744a95439fa1b4a55c5
 + local refname=c-d-full
 + local expected_tree=ffa191c987a8d3f597376744a95439fa1b4a55c5
-+ git rev-parse c-d-full^{tree}
+++ git rev-parse 'c-d-full^{tree}'
 + test ffa191c987a8d3f597376744a95439fa1b4a55c5 = ffa191c987a8d3f597376744a95439fa1b4a55c5
 py311: commands[2] .pybuild/cpython3_3.11/build> /bin/sh t/test-really-conflicted
-+ dirname t/test-really-conflicted
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-really-conflicted
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
-+ DESCRIPTION=git-imerge test repository with multiple conflicts
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted git-imerge test repository with multiple conflicts
++ DESCRIPTION='git-imerge test repository with multiple conflicts'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
-+ local description=git-imerge test repository with multiple conflicts
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted git-imerge test repository with multiple conflicts
++ local 'description=git-imerge test repository with multiple conflicts'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted 'git-imerge test repository with multiple conflicts'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
-+ local description=git-imerge test repository with multiple conflicts
++ local 'description=git-imerge test repository with multiple conflicts'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
@@ -6812,10 +7466,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint: 
 hint: 	git branch -m <name>
-+ echo git-imerge test repository with multiple conflicts
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name Loú User
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git/
++ echo 'git-imerge test repository with multiple conflicts'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted
@@ -6830,51 +7484,60 @@
 + text=0
 + echo 0
 + git add d.txt
-+ seq 0 7
-+ modify conflict0.txt original version
+++ seq 0 7
++ for i in $(seq 0 7)
++ modify conflict0.txt 'original version'
 + filename=conflict0.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict0.txt
-+ modify conflict1.txt original version
++ for i in $(seq 0 7)
++ modify conflict1.txt 'original version'
 + filename=conflict1.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict1.txt
-+ modify conflict2.txt original version
++ for i in $(seq 0 7)
++ modify conflict2.txt 'original version'
 + filename=conflict2.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict2.txt
-+ modify conflict3.txt original version
++ for i in $(seq 0 7)
++ modify conflict3.txt 'original version'
 + filename=conflict3.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict3.txt
-+ modify conflict4.txt original version
++ for i in $(seq 0 7)
++ modify conflict4.txt 'original version'
 + filename=conflict4.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict4.txt
-+ modify conflict5.txt original version
++ for i in $(seq 0 7)
++ modify conflict5.txt 'original version'
 + filename=conflict5.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict5.txt
-+ modify conflict6.txt original version
++ for i in $(seq 0 7)
++ modify conflict6.txt 'original version'
 + filename=conflict6.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict6.txt
-+ modify conflict7.txt original version
++ for i in $(seq 0 7)
++ modify conflict7.txt 'original version'
 + filename=conflict7.txt
-+ text=original version
-+ echo original version
++ text='original version'
++ echo 'original version'
 + git add conflict7.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
-+ git checkout -b c master --
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) 8e21fbd] m⇒0
  10 files changed, 10 insertions(+)
  create mode 100644 c.txt
@@ -6887,25 +7550,28 @@
  create mode 100644 conflict6.txt
  create mode 100644 conflict7.txt
  create mode 100644 d.txt
++ git checkout -b c master --
 Switched to a new branch 'c'
 + modify c.txt 1
 + filename=c.txt
 + text=1
 + echo 1
 + git add c.txt
-+ modify conflict0.txt c version
++ modify conflict0.txt 'c version'
 + filename=conflict0.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict0.txt
-+ modify conflict4.txt c version
++ modify conflict4.txt 'c version'
 + filename=conflict4.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict4.txt
-+ commit -m c⇒1
++ commit -m $'c\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m c⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
 [c 4e6007a] c⇒1
  3 files changed, 3 insertions(+), 3 deletions(-)
 + modify c.txt 2
@@ -6913,9 +7579,11 @@
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
++ commit -m $'c\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m c⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
 [c c2b7c49] c⇒2
  1 file changed, 1 insertion(+), 1 deletion(-)
 + modify c.txt 3
@@ -6923,44 +7591,50 @@
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
++ commit -m $'c\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m c⇒3
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
+[c 42ad55a] c⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 + modify c.txt 4
 + filename=c.txt
 + text=4
-[c 42ad55a] c⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
 + echo 4
 + git add c.txt
-+ modify conflict1.txt c version
++ modify conflict1.txt 'c version'
 + filename=conflict1.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict1.txt
-+ commit -m c⇒4
++ commit -m $'c\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
+[c a891793] c⇒4
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-[c a891793] c⇒4
- 2 files changed, 2 insertions(+), 2 deletions(-)
-+ modify conflict3.txt c version
++ modify conflict3.txt 'c version'
 + filename=conflict3.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict3.txt
-+ modify conflict6.txt c version
++ modify conflict6.txt 'c version'
 + filename=conflict6.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict6.txt
-+ commit -m c⇒5
++ commit -m $'c\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m c⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'c\342\207\2225'
 [c c21441d] c⇒5
  3 files changed, 3 insertions(+), 3 deletions(-)
 + modify c.txt 6
@@ -6968,14 +7642,16 @@
 + text=6
 + echo 6
 + git add c.txt
-+ modify conflict5.txt c version
++ modify conflict5.txt 'c version'
 + filename=conflict5.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict5.txt
-+ commit -m c⇒6
++ commit -m $'c\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m c⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
 [c a797a66] c⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
 + modify c.txt 7
@@ -6983,14 +7659,16 @@
 + text=7
 + echo 7
 + git add c.txt
-+ modify conflict2.txt c version
++ modify conflict2.txt 'c version'
 + filename=conflict2.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict2.txt
-+ commit -m c⇒7
++ commit -m $'c\342\207\2227'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m c⇒7
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
 [c c0e1537] c⇒7
  2 files changed, 2 insertions(+), 2 deletions(-)
 + modify c.txt 8
@@ -6998,24 +7676,28 @@
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
++ commit -m $'c\342\207\2228'
 + TIME=1112912002
-+ GIT_AUTHOR_DATE=@1112912002 +0000 GIT_COMMITTER_DATE=@1112912002 +0000 git commit -m c⇒8
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
+[c 9f3e7c8] c⇒8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
-[c 9f3e7c8] c⇒8
- 1 file changed, 1 insertion(+), 1 deletion(-)
 + git add c.txt
-+ modify conflict7.txt c version
++ modify conflict7.txt 'c version'
 + filename=conflict7.txt
-+ text=c version
-+ echo c version
++ text='c version'
++ echo 'c version'
 + git add conflict7.txt
-+ commit -m c⇒9
++ commit -m $'c\342\207\2229'
 + TIME=1112912003
-+ GIT_AUTHOR_DATE=@1112912003 +0000 GIT_COMMITTER_DATE=@1112912003 +0000 git commit -m c⇒9
++ GIT_AUTHOR_DATE='@1112912003 +0000'
++ GIT_COMMITTER_DATE='@1112912003 +0000'
++ git commit -m $'c\342\207\2229'
 [c ccbfccb] c⇒9
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout -b d master --
@@ -7025,19 +7707,21 @@
 + text=1
 + echo 1
 + git add d.txt
-+ modify conflict0.txt d version
++ modify conflict0.txt 'd version'
 + filename=conflict0.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict0.txt
-+ modify conflict6.txt d version
++ modify conflict6.txt 'd version'
 + filename=conflict6.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict6.txt
-+ commit -m d⇒1
++ commit -m $'d\342\207\2221'
 + TIME=1112912004
-+ GIT_AUTHOR_DATE=@1112912004 +0000 GIT_COMMITTER_DATE=@1112912004 +0000 git commit -m d⇒1
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 [d 8c3c065] d⇒1
  3 files changed, 3 insertions(+), 3 deletions(-)
 + modify d.txt 2
@@ -7045,19 +7729,21 @@
 + text=2
 + echo 2
 + git add d.txt
-+ modify conflict1.txt d version
++ modify conflict1.txt 'd version'
 + filename=conflict1.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict1.txt
-+ modify conflict2.txt d version
++ modify conflict2.txt 'd version'
 + filename=conflict2.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict2.txt
-+ commit -m d⇒2
++ commit -m $'d\342\207\2222'
 + TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
 [d 820b787] d⇒2
  3 files changed, 3 insertions(+), 3 deletions(-)
 + modify d.txt 3
@@ -7065,9 +7751,11 @@
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
++ commit -m $'d\342\207\2223'
 + TIME=1112912006
-+ GIT_AUTHOR_DATE=@1112912006 +0000 GIT_COMMITTER_DATE=@1112912006 +0000 git commit -m d⇒3
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
 [d 821c792] d⇒3
  1 file changed, 1 insertion(+), 1 deletion(-)
 + modify d.txt 4
@@ -7075,9 +7763,11 @@
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
++ commit -m $'d\342\207\2224'
 + TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
++ GIT_AUTHOR_DATE='@1112912007 +0000'
++ GIT_COMMITTER_DATE='@1112912007 +0000'
++ git commit -m $'d\342\207\2224'
 [d c2a1456] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
 + modify d.txt 5
@@ -7085,29 +7775,33 @@
 + text=5
 + echo 5
 + git add d.txt
-+ modify conflict3.txt d version
++ modify conflict3.txt 'd version'
 + filename=conflict3.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict3.txt
-+ commit -m d⇒5
++ commit -m $'d\342\207\2225'
 + TIME=1112912008
-+ GIT_AUTHOR_DATE=@1112912008 +0000 GIT_COMMITTER_DATE=@1112912008 +0000 git commit -m d⇒5
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
+[d c3e3890] d⇒5
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 + modify d.txt 6
 + filename=d.txt
 + text=6
 + echo 6
 + git add d.txt
-+ modify conflict4.txt d version
++ modify conflict4.txt 'd version'
 + filename=conflict4.txt
-+ text=d version
-+ echo d version
-[d c3e3890] d⇒5
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ text='d version'
++ echo 'd version'
 + git add conflict4.txt
-+ commit -m d⇒6
++ commit -m $'d\342\207\2226'
 + TIME=1112912009
-+ GIT_AUTHOR_DATE=@1112912009 +0000 GIT_COMMITTER_DATE=@1112912009 +0000 git commit -m d⇒6
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 [d b2f5c5e] d⇒6
  2 files changed, 2 insertions(+), 2 deletions(-)
 + modify d.txt 7
@@ -7115,29 +7809,33 @@
 + text=7
 + echo 7
 + git add d.txt
-+ modify conflict5.txt d version
++ modify conflict5.txt 'd version'
 + filename=conflict5.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict5.txt
-+ commit -m d⇒7
++ commit -m $'d\342\207\2227'
 + TIME=1112912010
-+ GIT_AUTHOR_DATE=@1112912010 +0000 GIT_COMMITTER_DATE=@1112912010 +0000 git commit -m d⇒7
++ GIT_AUTHOR_DATE='@1112912010 +0000'
++ GIT_COMMITTER_DATE='@1112912010 +0000'
++ git commit -m $'d\342\207\2227'
+[d 892af56] d⇒7
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 + modify d.txt 8
 + filename=d.txt
 + text=8
 + echo 8
 + git add d.txt
-[d 892af56] d⇒7
- 2 files changed, 2 insertions(+), 2 deletions(-)
-+ modify conflict7.txt d version
++ modify conflict7.txt 'd version'
 + filename=conflict7.txt
-+ text=d version
-+ echo d version
++ text='d version'
++ echo 'd version'
 + git add conflict7.txt
-+ commit -m d⇒8
++ commit -m $'d\342\207\2228'
 + TIME=1112912011
-+ GIT_AUTHOR_DATE=@1112912011 +0000 GIT_COMMITTER_DATE=@1112912011 +0000 git commit -m d⇒8
++ GIT_AUTHOR_DATE='@1112912011 +0000'
++ GIT_COMMITTER_DATE='@1112912011 +0000'
++ git commit -m $'d\342\207\2228'
 [d 67099d0] d⇒8
  2 files changed, 2 insertions(+), 2 deletions(-)
 + git checkout c
@@ -7233,26 +7931,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
-+ modify conflict0.txt merged version
++ modify conflict0.txt 'merged version'
 + filename=conflict0.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict0.txt
 + conflict_count=1
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
 + git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d 0fbb0d6] imerge 'c-d': manual merge 1-1
+[imerge/c-d 7bf1c37] imerge 'c-d': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting automerge of 1-8...failure.
 Attempting automerge of 1-2...success.
@@ -7344,26 +8050,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
-+ modify conflict4.txt merged version
++ modify conflict4.txt 'merged version'
 + filename=conflict4.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict4.txt
 + conflict_count=2
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
 + git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d 6045717] imerge 'c-d': manual merge 1-6
+[imerge/c-d fd7e4d8] imerge 'c-d': manual merge 1-6
 Merge has been recorded for merge 1-6.
 Attempting automerge of 1-8...success.
 Autofilling 1-7...success.
@@ -7380,12 +8094,12 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  41ebdd4 imerge 'c-d': automatic merge 3-8
+  79102c7 imerge 'c-d': automatic merge 3-8
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 41ebdd4
+ git branch <new-branch-name> 79102c7
 
 Switched to branch 'imerge/c-d'
 Auto-merging conflict1.txt
@@ -7434,26 +8148,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
-+ modify conflict1.txt merged version
++ modify conflict1.txt 'merged version'
 + filename=conflict1.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict1.txt
 + conflict_count=3
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
-+ tee autofill.out
 + git-imerge continue --no-edit
-[imerge/c-d 774dcd9] imerge 'c-d': manual merge 4-2
++ tee autofill.out
+[imerge/c-d 62d7e5b] imerge 'c-d': manual merge 4-2
 Merge has been recorded for merge 4-2.
 Attempting automerge of 4-8...success.
 Autofilling 4-3...success.
@@ -7463,7 +8185,7 @@
 Autofilling 4-7...success.
 Autofilling 4-8...success.
 Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[3:5,2:9].
-Previous HEAD position was 603400a imerge 'c-d': automatic merge 4-8
+Previous HEAD position was 1f975f9 imerge 'c-d': automatic merge 4-8
 Switched to branch 'imerge/c-d'
 Auto-merging conflict6.txt
 CONFLICT (content): Merge conflict in conflict6.txt
@@ -7511,26 +8233,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
-+ modify conflict6.txt merged version
++ modify conflict6.txt 'merged version'
 + filename=conflict6.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict6.txt
 + conflict_count=4
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
 + git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d 1d0d4a7] imerge 'c-d': manual merge 5-1
+[imerge/c-d 769ae2d] imerge 'c-d': manual merge 5-1
 Merge has been recorded for merge 5-1.
 Attempting automerge of 5-8...failure.
 Attempting automerge of 5-2...success.
@@ -7565,7 +8295,7 @@
 Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[6:10,0:2].
 Attempting automerge of 9-4...failure.
 Attempting automerge of 7-2...failure.
-Previous HEAD position was 4489045 imerge 'c-d': automatic merge 7-1
+Previous HEAD position was efd991e imerge 'c-d': automatic merge 7-1
 Switched to branch 'imerge/c-d'
 Auto-merging conflict3.txt
 CONFLICT (content): Merge conflict in conflict3.txt
@@ -7613,26 +8343,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
-+ modify conflict3.txt merged version
++ modify conflict3.txt 'merged version'
 + filename=conflict3.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict3.txt
 + conflict_count=5
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
-+ tee autofill.out
 + git-imerge continue --no-edit
-[imerge/c-d 9455466] imerge 'c-d': manual merge 5-5
++ tee autofill.out
+[imerge/c-d 2c2d25a] imerge 'c-d': manual merge 5-5
 Merge has been recorded for merge 5-5.
 Attempting automerge of 5-8...success.
 Autofilling 5-6...success.
@@ -7695,31 +8433,39 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
-+ modify conflict5.txt merged version
++ modify conflict5.txt 'merged version'
 + filename=conflict5.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict5.txt
 + conflict_count=6
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
-+ + git-imerge continuetee --no-edit autofill.out
-
-[imerge/c-d 5f4acba] imerge 'c-d': manual merge 6-7
++ git-imerge continue --no-edit
++ tee autofill.out
+[imerge/c-d de0beda] imerge 'c-d': manual merge 6-7
 Merge has been recorded for merge 6-7.
 Attempting automerge of 6-8...success.
 Autofilling 6-8...success.
 Recording autofilled block MergeState('c-d', tip1='c', tip2='d', goal='merge')[5:7,7:9].
-Previous HEAD position was 78ee29b imerge 'c-d': automatic merge 6-8
+Previous HEAD position was 5866295 imerge 'c-d': automatic merge 6-8
 Switched to branch 'imerge/c-d'
 Auto-merging conflict2.txt
 CONFLICT (content): Merge conflict in conflict2.txt
@@ -7767,26 +8513,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
-+ modify conflict2.txt merged version
++ modify conflict2.txt 'merged version'
 + filename=conflict2.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict2.txt
 + conflict_count=7
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
 + true
-+ tee autofill.out
 + git-imerge continue --no-edit
-[imerge/c-d f28859c] imerge 'c-d': manual merge 7-2
++ tee autofill.out
+[imerge/c-d c9d2d0b] imerge 'c-d': manual merge 7-2
 Merge has been recorded for merge 7-2.
 Attempting automerge of 7-8...success.
 Autofilling 7-3...success.
@@ -7868,26 +8622,34 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
-+ seq 0 7
++ grep -q 'There was a conflict merging' autofill.out
+++ seq 0 7
++ for i in $(seq 0 7)
 + grep -q ==== conflict0.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict1.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict2.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict3.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict4.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict5.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict6.txt
++ for i in $(seq 0 7)
 + grep -q ==== conflict7.txt
-+ modify conflict7.txt merged version
++ modify conflict7.txt 'merged version'
 + filename=conflict7.txt
-+ text=merged version
-+ echo merged version
++ text='merged version'
++ echo 'merged version'
 + git add conflict7.txt
 + conflict_count=8
 + true
-+ tee autofill.out
 + git-imerge continue --no-edit
-[imerge/c-d e58b9a8] imerge 'c-d': manual merge 9-8
++ tee autofill.out
+[imerge/c-d db88722] imerge 'c-d': manual merge 9-8
 Merge has been recorded for merge 9-8.
 Merge is complete!
 + grep -q Traceback autofill.out
@@ -7914,20 +8676,21 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging autofill.out
++ grep -q 'There was a conflict merging' autofill.out
 + break
 + test 8 -ne 8
 + git-imerge diagram --commits
 + cat
 + diff -u - diagram.out
 + EXPECTED_TREE=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=c-d-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=c-d-merge
 Merge d into c (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:10 2024 +0000
+# Date:      Wed Jul 2 23:49:14 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
@@ -7941,60 +8704,60 @@
 #	modified:   conflict7.txt
 #	modified:   d.txt
 #
-[c-d-merge 62ae9c3] Merge d into c (using imerge)
- Date: Thu May 30 17:24:10 2024 +0000
+[c-d-merge cf8466b] Merge d into c (using imerge)
+ Date: Wed Jul 2 23:49:14 2025 +0000
 + check_tree c-d-merge 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-merge
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-merge^{tree}
+++ git rev-parse 'c-d-merge^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge simplify --goal=rebase --branch=c-d-rebase
 + check_tree c-d-rebase 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-rebase
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-rebase^{tree}
+++ git rev-parse 'c-d-rebase^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge simplify --goal=rebase-with-history --branch=c-d-rebase-with-history
 + check_tree c-d-rebase-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-rebase-with-history
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-rebase-with-history^{tree}
+++ git rev-parse 'c-d-rebase-with-history^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge simplify --goal=border --branch=c-d-border
 + check_tree c-d-border 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-border
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-border^{tree}
+++ git rev-parse 'c-d-border^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge simplify --goal=border-with-history --branch=c-d-border-with-history
 + check_tree c-d-border-with-history 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-border-with-history
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-border-with-history^{tree}
+++ git rev-parse 'c-d-border-with-history^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge simplify --goal=border-with-history2 --branch=c-d-border-with-history2
 + check_tree c-d-border-with-history2 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + local refname=c-d-border-with-history2
 + local expected_tree=13e5a8955ab8f88dc7fec8278ee2622655c21d7f
-+ git rev-parse c-d-border-with-history2^{tree}
+++ git rev-parse 'c-d-border-with-history2^{tree}'
 + test 13e5a8955ab8f88dc7fec8278ee2622655c21d7f = 13e5a8955ab8f88dc7fec8278ee2622655c21d7f
 + git-imerge remove
 py311: commands[3] .pybuild/cpython3_3.11/build> /bin/sh t/test-duplicated
-+ dirname t/test-duplicated
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-duplicated
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
-+ DESCRIPTION=git-imerge test repository with duplicate commits
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated git-imerge test repository with duplicate commits
++ DESCRIPTION='git-imerge test repository with duplicate commits'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
-+ local description=git-imerge test repository with duplicate commits
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated git-imerge test repository with duplicate commits
++ local 'description=git-imerge test repository with duplicate commits'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated 'git-imerge test repository with duplicate commits'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
-+ local description=git-imerge test repository with duplicate commits
++ local 'description=git-imerge test repository with duplicate commits'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
@@ -8009,9 +8772,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git/
-+ echo git-imerge test repository with duplicate commits
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name Loú User
++ echo 'git-imerge test repository with duplicate commits'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated
@@ -8021,86 +8784,109 @@
 + text=0
 + echo 0
 + git add a.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
-+ git checkout -b a --
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) a733afa] m⇒0
  1 file changed, 1 insertion(+)
  create mode 100644 a.txt
++ git checkout -b a --
 Switched to a new branch 'a'
-+ seq 3
+++ seq 3
++ for i in $(seq 3)
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1 on branch a
++ commit -m 'a⇒1 on branch a'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m 'a⇒1 on branch a'
 [a 2f1f75a] a⇒1 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 3)
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-+ commit -m a⇒2 on branch a
++ commit -m 'a⇒2 on branch a'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m 'a⇒2 on branch a'
 [a 4700669] a⇒2 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 3)
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3 on branch a
++ commit -m 'a⇒3 on branch a'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
-+ git checkout -b b master --
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m 'a⇒3 on branch a'
 [a 621c381] a⇒3 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ git checkout -b b master --
 Switched to a new branch 'b'
-+ seq 4
+++ seq 4
++ for i in $(seq 4)
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1 on branch b
++ commit -m 'a⇒1 on branch b'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒1 on branch b
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'a⇒1 on branch b'
 [b 62a5c56] a⇒1 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 4)
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-+ commit -m a⇒2 on branch b
++ commit -m 'a⇒2 on branch b'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a⇒2 on branch b
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m 'a⇒2 on branch b'
 [b f846281] a⇒2 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 4)
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3 on branch b
++ commit -m 'a⇒3 on branch b'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a⇒3 on branch b
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m 'a⇒3 on branch b'
 [b a4b2c2b] a⇒3 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in $(seq 4)
 + modify a.txt 4
 + filename=a.txt
 + text=4
 + echo 4
 + git add a.txt
-+ commit -m a⇒4 on branch b
++ commit -m 'a⇒4 on branch b'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m a⇒4 on branch b
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m 'a⇒4 on branch b'
 [b 5b24553] a⇒4 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
 + EXPECTED_TREE=9d521927e179e882efacd2a0ba94b89a1de00eb2
@@ -8175,54 +8961,55 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge simplify --goal=merge --branch=a-b-merge
++ GIT_EDITOR=cat
++ git-imerge simplify --goal=merge --branch=a-b-merge
 Merge b into a (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:14 2024 +0000
+# Date:      Wed Jul 2 23:49:16 2025 +0000
 #
 # On branch a-b-merge
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-b-merge a2577c8] Merge b into a (using imerge)
- Date: Thu May 30 17:24:14 2024 +0000
+[a-b-merge 310adc3] Merge b into a (using imerge)
+ Date: Wed Jul 2 23:49:16 2025 +0000
 + check_tree a-b-merge 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-merge
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-merge^{tree}
+++ git rev-parse 'a-b-merge^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git-imerge simplify --goal=rebase --branch=a-b-rebase
 + check_tree a-b-rebase 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-rebase
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-rebase^{tree}
+++ git rev-parse 'a-b-rebase^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git-imerge simplify --goal=rebase-with-history --branch=a-b-rebase-with-history
 + check_tree a-b-rebase-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-rebase-with-history
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-rebase-with-history^{tree}
+++ git rev-parse 'a-b-rebase-with-history^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git-imerge simplify --goal=border --branch=a-b-border
 + check_tree a-b-border 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-border
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-border^{tree}
+++ git rev-parse 'a-b-border^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git-imerge simplify --goal=border-with-history --branch=a-b-border-with-history
 + check_tree a-b-border-with-history 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-border-with-history
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-border-with-history^{tree}
+++ git rev-parse 'a-b-border-with-history^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git-imerge finish --goal=border-with-history2 --branch=a-b-border-with-history2
 + check_tree a-b-border-with-history2 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-border-with-history2
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-border-with-history2^{tree}
+++ git rev-parse 'a-b-border-with-history2^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + git checkout a
 Switched to branch 'a'
@@ -8275,26 +9062,27 @@
 + check_tree a-b-full 9d521927e179e882efacd2a0ba94b89a1de00eb2
 + local refname=a-b-full
 + local expected_tree=9d521927e179e882efacd2a0ba94b89a1de00eb2
-+ git rev-parse a-b-full^{tree}
+++ git rev-parse 'a-b-full^{tree}'
 + test 9d521927e179e882efacd2a0ba94b89a1de00eb2 = 9d521927e179e882efacd2a0ba94b89a1de00eb2
 py311: commands[4] .pybuild/cpython3_3.11/build> /bin/sh t/test-flip-flop
-+ dirname t/test-flip-flop
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-flip-flop
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
++ for n in 1 2 3
 + flip_flop_test 1
 + local n=1
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
-+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=1
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1
++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=1'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 'git-imerge test repository with a commit and its revert at n=1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
-+ local description=git-imerge test repository with a commit and its revert at n=1
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 git-imerge test repository with a commit and its revert at n=1
++ local 'description=git-imerge test repository with a commit and its revert at n=1'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1 'git-imerge test repository with a commit and its revert at n=1'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
-+ local description=git-imerge test repository with a commit and its revert at n=1
++ local 'description=git-imerge test repository with a commit and its revert at n=1'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
@@ -8309,9 +9097,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/
-+ echo git-imerge test repository with a commit and its revert at n=1
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name Loú User
++ echo 'git-imerge test repository with a commit and its revert at n=1'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1
@@ -8321,72 +9109,87 @@
 + text=0
 + echo 0
 + git add a.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) a733afa] m⇒0
  1 file changed, 1 insertion(+)
  create mode 100644 a.txt
 + git checkout -b a --
 Switched to a new branch 'a'
++ for i in 1 2 3
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1 on branch a
++ commit -m 'a⇒1 on branch a'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m 'a⇒1 on branch a'
 [a 2f1f75a] a⇒1 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-+ commit -m a⇒2 on branch a
++ commit -m 'a⇒2 on branch a'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m 'a⇒2 on branch a'
 [a 4700669] a⇒2 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3 on branch a
++ commit -m 'a⇒3 on branch a'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m 'a⇒3 on branch a'
 [a 621c381] a⇒3 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b b master --
 Switched to a new branch 'b'
++ for i in 1 2 3 4
 + modify b.txt 1
 + filename=b.txt
 + text=1
 + echo 1
 + git add b.txt
-+ msg=b⇒1
++ msg=$'b\342\207\2221'
 + test 1 = 1
 + modify a.txt X
 + filename=a.txt
 + text=X
 + echo X
 + git add a.txt
-+ msg=b⇒1 and a⇒X
++ msg='b⇒1 and a⇒X'
 + test 1 = 2
-+ commit -m b⇒1 and a⇒X on branch b
++ commit -m 'b⇒1 and a⇒X on branch b'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 and a⇒X on branch b
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'b⇒1 and a⇒X on branch b'
 [b 044a3fa] b⇒1 and a⇒X on branch b
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 b.txt
++ for i in 1 2 3 4
 + modify b.txt 2
 + filename=b.txt
 + text=2
 + echo 2
 + git add b.txt
-+ msg=b⇒2
++ msg=$'b\342\207\2222'
 + test 2 = 1
 + test 2 = 2
 + modify a.txt 0
@@ -8394,36 +9197,44 @@
 + text=0
 + echo 0
 + git add a.txt
-+ msg=b⇒2 and a⇒0
-+ commit -m b⇒2 and a⇒0 on branch b
++ msg='b⇒2 and a⇒0'
++ commit -m 'b⇒2 and a⇒0 on branch b'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒0 on branch b
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m 'b⇒2 and a⇒0 on branch b'
 [b 7851975] b⇒2 and a⇒0 on branch b
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in 1 2 3 4
 + modify b.txt 3
 + filename=b.txt
 + text=3
 + echo 3
 + git add b.txt
-+ msg=b⇒3
++ msg=$'b\342\207\2223'
 + test 3 = 1
 + test 3 = 2
-+ commit -m b⇒3 on branch b
++ commit -m 'b⇒3 on branch b'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 on branch b
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m 'b⇒3 on branch b'
+[b 6fe24f0] b⇒3 on branch b
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3 4
 + modify b.txt 4
 + filename=b.txt
 + text=4
 + echo 4
 + git add b.txt
-+ msg=b⇒4
++ msg=$'b\342\207\2224'
 + test 4 = 1
 + test 4 = 2
-+ commit -m b⇒4 on branch b
++ commit -m 'b⇒4 on branch b'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b
-[b 6fe24f0] b⇒3 on branch b
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m 'b⇒4 on branch b'
 [b 2dc5eb7] b⇒4 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
 + test_merge b-into-a-1 a b 1-1 1-2
@@ -8495,12 +9306,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-1 imerge-b-into-a-1-1.out
++ grep -q 'There was a conflict merging commit 1-1' imerge-b-into-a-1-1.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-b-into-a-1-2.out
-[imerge/b f142213] imerge 'b': manual merge 1-1
+[imerge/b 7a77cd7] imerge 'b': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting automerge of 1-4...failure.
 Attempting automerge of 1-2...failure.
@@ -8508,7 +9319,7 @@
 Autofilling 2-1...success.
 Autofilling 3-1...success.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,0:2].
-Previous HEAD position was 85f2a58 imerge 'b': automatic merge 3-1
+Previous HEAD position was 38774b2 imerge 'b': automatic merge 3-1
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -8561,12 +9372,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-2 imerge-b-into-a-1-2.out
++ grep -q 'There was a conflict merging commit 1-2' imerge-b-into-a-1-2.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-b-into-a-1-3.out
-[imerge/b 6c58c06] imerge 'b': manual merge 1-2
+[imerge/b 346d2b5] imerge 'b': manual merge 1-2
 Merge has been recorded for merge 1-2.
 Attempting automerge of 1-4...success.
 Autofilling 1-3...success.
@@ -8581,7 +9392,7 @@
 The two ways of autofilling 3-4 agree.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:5].
 Merge is complete!
-+ grep -q Merge is complete imerge-b-into-a-1-3.out
++ grep -q 'Merge is complete' imerge-b-into-a-1-3.out
 + git-imerge diagram --commits --frontier
        0  3
        |  |
@@ -8611,20 +9422,21 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge b into a (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:21 2024 +0000
+# Date:      Wed Jul 2 23:49:19 2025 +0000
 #
 # On branch b-into-a-1
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-1 a68d341] Merge b into a (using imerge)
- Date: Thu May 30 17:24:21 2024 +0000
+[b-into-a-1 0c980b2] Merge b into a (using imerge)
+ Date: Wed Jul 2 23:49:19 2025 +0000
 + test_merge a-into-b-1 b a 1-1 2-1
 + local name=a-into-b-1
 + local dst=b
@@ -8689,12 +9501,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-1 imerge-a-into-b-1-1.out
++ grep -q 'There was a conflict merging commit 1-1' imerge-a-into-b-1-1.out
 + echo 1
 + git add a.txt
-+ tee imerge-a-into-b-1-2.out
 + git-imerge continue --no-edit
-[imerge/a 145f39d] imerge 'a': manual merge 1-1
++ tee imerge-a-into-b-1-2.out
+[imerge/a 3852ded] imerge 'a': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting automerge of 1-3...success.
 Autofilling 1-2...success.
@@ -8752,12 +9564,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 2-1 imerge-a-into-b-1-2.out
++ grep -q 'There was a conflict merging commit 2-1' imerge-a-into-b-1-2.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-a-into-b-1-3.out
-[imerge/a 73b3d00] imerge 'a': manual merge 2-1
+[imerge/a dcaa8ba] imerge 'a': manual merge 2-1
 Merge has been recorded for merge 2-1.
 Attempting automerge of 2-3...success.
 Autofilling 2-2...success.
@@ -8772,7 +9584,7 @@
 The two ways of autofilling 4-3 agree.
 Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[2:5,0:4].
 Merge is complete!
-+ grep -q Merge is complete imerge-a-into-b-1-3.out
++ grep -q 'Merge is complete' imerge-a-into-b-1-3.out
 + git-imerge diagram --commits --frontier
        0   4
        |   |
@@ -8800,30 +9612,32 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge a into b (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:25 2024 +0000
+# Date:      Wed Jul 2 23:49:19 2025 +0000
 #
 # On branch a-into-b-1
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-1 15035e1] Merge a into b (using imerge)
- Date: Thu May 30 17:24:25 2024 +0000
+[a-into-b-1 4b21c01] Merge a into b (using imerge)
+ Date: Wed Jul 2 23:49:19 2025 +0000
++ for n in 1 2 3
 + flip_flop_test 2
 + local n=2
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
-+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=2
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2
++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=2'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 'git-imerge test repository with a commit and its revert at n=2'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
-+ local description=git-imerge test repository with a commit and its revert at n=2
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 git-imerge test repository with a commit and its revert at n=2
++ local 'description=git-imerge test repository with a commit and its revert at n=2'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2 'git-imerge test repository with a commit and its revert at n=2'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
-+ local description=git-imerge test repository with a commit and its revert at n=2
++ local 'description=git-imerge test repository with a commit and its revert at n=2'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
@@ -8838,9 +9652,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git/
-+ echo git-imerge test repository with a commit and its revert at n=2
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name Loú User
++ echo 'git-imerge test repository with a commit and its revert at n=2'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-2
@@ -8850,85 +9664,103 @@
 + text=0
 + echo 0
 + git add a.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) a733afa] m⇒0
  1 file changed, 1 insertion(+)
  create mode 100644 a.txt
 + git checkout -b a --
 Switched to a new branch 'a'
++ for i in 1 2 3
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1 on branch a
++ commit -m 'a⇒1 on branch a'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m 'a⇒1 on branch a'
 [a 2f1f75a] a⇒1 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-+ commit -m a⇒2 on branch a
++ commit -m 'a⇒2 on branch a'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m 'a⇒2 on branch a'
 [a 4700669] a⇒2 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3 on branch a
++ commit -m 'a⇒3 on branch a'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m 'a⇒3 on branch a'
 [a 621c381] a⇒3 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
 + git checkout -b b master --
 Switched to a new branch 'b'
++ for i in 1 2 3 4
 + modify b.txt 1
 + filename=b.txt
 + text=1
 + echo 1
 + git add b.txt
-+ msg=b⇒1
++ msg=$'b\342\207\2221'
 + test 1 = 2
 + test 1 = 3
-+ commit -m b⇒1 on branch b
++ commit -m 'b⇒1 on branch b'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b
-+ modify b.txt 2
-+ filename=b.txt
-+ text=2
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'b⇒1 on branch b'
 [b 1f7d097] b⇒1 on branch b
  1 file changed, 1 insertion(+)
  create mode 100644 b.txt
++ for i in 1 2 3 4
++ modify b.txt 2
++ filename=b.txt
++ text=2
 + echo 2
 + git add b.txt
-+ msg=b⇒2
++ msg=$'b\342\207\2222'
 + test 2 = 2
 + modify a.txt X
 + filename=a.txt
 + text=X
 + echo X
 + git add a.txt
-+ msg=b⇒2 and a⇒X
++ msg='b⇒2 and a⇒X'
 + test 2 = 3
-+ commit -m b⇒2 and a⇒X on branch b
++ commit -m 'b⇒2 and a⇒X on branch b'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 and a⇒X on branch b
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m 'b⇒2 and a⇒X on branch b'
+[b 48df77d] b⇒2 and a⇒X on branch b
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in 1 2 3 4
 + modify b.txt 3
 + filename=b.txt
 + text=3
 + echo 3
 + git add b.txt
-[b 48df77d] b⇒2 and a⇒X on branch b
- 2 files changed, 2 insertions(+), 2 deletions(-)
-+ msg=b⇒3
++ msg=$'b\342\207\2223'
 + test 3 = 2
 + test 3 = 3
 + modify a.txt 0
@@ -8936,23 +9768,28 @@
 + text=0
 + echo 0
 + git add a.txt
-+ msg=b⇒3 and a⇒0
-+ commit -m b⇒3 and a⇒0 on branch b
++ msg='b⇒3 and a⇒0'
++ commit -m 'b⇒3 and a⇒0 on branch b'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒0 on branch b
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m 'b⇒3 and a⇒0 on branch b'
 [b f3ef019] b⇒3 and a⇒0 on branch b
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in 1 2 3 4
 + modify b.txt 4
 + filename=b.txt
 + text=4
 + echo 4
 + git add b.txt
-+ msg=b⇒4
++ msg=$'b\342\207\2224'
 + test 4 = 2
 + test 4 = 3
-+ commit -m b⇒4 on branch b
++ commit -m 'b⇒4 on branch b'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 on branch b
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m 'b⇒4 on branch b'
 [b 69d0c21] b⇒4 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
 + test_merge b-into-a-2 a b 1-2 1-3
@@ -8963,8 +9800,8 @@
 + local conflict2=1-3
 + git checkout a
 Switched to branch 'a'
-+ tee imerge-b-into-a-2-1.out
 + git-imerge merge --branch=b-into-a-2 b
++ tee imerge-b-into-a-2-1.out
 Attempting automerge of 3-4...success.
 Autofilling 1-4...success.
 Autofilling 2-4...success.
@@ -9038,12 +9875,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-2 imerge-b-into-a-2-1.out
++ grep -q 'There was a conflict merging commit 1-2' imerge-b-into-a-2-1.out
 + echo 1
 + git add a.txt
-+ tee imerge-b-into-a-2-2.out
 + git-imerge continue --no-edit
-[imerge/b 4452e6a] imerge 'b': manual merge 1-2
++ tee imerge-b-into-a-2-2.out
+[imerge/b 022eec3] imerge 'b': manual merge 1-2
 Merge has been recorded for merge 1-2.
 Attempting automerge of 1-4...failure.
 Attempting automerge of 1-3...failure.
@@ -9051,7 +9888,7 @@
 Autofilling 2-2...success.
 Autofilling 3-2...success.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,1:3].
-Previous HEAD position was 277ad81 imerge 'b': automatic merge 3-2
+Previous HEAD position was 90b471e imerge 'b': automatic merge 3-2
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -9104,12 +9941,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-3 imerge-b-into-a-2-2.out
++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-2-2.out
 + echo 1
 + git add a.txt
-+ tee imerge-b-into-a-2-3.out
 + git-imerge continue --no-edit
-[imerge/b 772e0cb] imerge 'b': manual merge 1-3
++ tee imerge-b-into-a-2-3.out
+[imerge/b e1deaa7] imerge 'b': manual merge 1-3
 Merge has been recorded for merge 1-3.
 Attempting automerge of 1-4...success.
 Autofilling 1-4...success.
@@ -9122,7 +9959,7 @@
 The two ways of autofilling 3-4 agree.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:5].
 Merge is complete!
-+ grep -q Merge is complete imerge-b-into-a-2-3.out
++ grep -q 'Merge is complete' imerge-b-into-a-2-3.out
 + git-imerge diagram --commits --frontier
        0  3
        |  |
@@ -9152,20 +9989,21 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge b into a (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:30 2024 +0000
+# Date:      Wed Jul 2 23:49:21 2025 +0000
 #
 # On branch b-into-a-2
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-2 6ac412f] Merge b into a (using imerge)
- Date: Thu May 30 17:24:30 2024 +0000
+[b-into-a-2 5170a05] Merge b into a (using imerge)
+ Date: Wed Jul 2 23:49:21 2025 +0000
 + test_merge a-into-b-2 b a 2-1 3-1
 + local name=a-into-b-2
 + local dst=b
@@ -9174,8 +10012,8 @@
 + local conflict2=3-1
 + git checkout b
 Switched to branch 'b'
-+ tee imerge-a-into-b-2-1.out
 + git-imerge merge --branch=a-into-b-2 a
++ tee imerge-a-into-b-2-1.out
 Attempting automerge of 4-3...success.
 Autofilling 1-3...success.
 Autofilling 2-3...unexpected conflict.  Backtracking...
@@ -9235,12 +10073,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 2-1 imerge-a-into-b-2-1.out
++ grep -q 'There was a conflict merging commit 2-1' imerge-a-into-b-2-1.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-a-into-b-2-2.out
-[imerge/a 368f520] imerge 'a': manual merge 2-1
+[imerge/a f6666c5] imerge 'a': manual merge 2-1
 Merge has been recorded for merge 2-1.
 Attempting automerge of 2-3...success.
 Autofilling 2-2...success.
@@ -9298,12 +10136,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 3-1 imerge-a-into-b-2-2.out
++ grep -q 'There was a conflict merging commit 3-1' imerge-a-into-b-2-2.out
 + echo 1
 + git add a.txt
-+ tee imerge-a-into-b-2-3.out
 + git-imerge continue --no-edit
-[imerge/a 650735e] imerge 'a': manual merge 3-1
++ tee imerge-a-into-b-2-3.out
+[imerge/a 0c7b0af] imerge 'a': manual merge 3-1
 Merge has been recorded for merge 3-1.
 Attempting automerge of 3-3...success.
 Autofilling 3-2...success.
@@ -9315,7 +10153,7 @@
 Autofilling 4-3...success.
 Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,0:4].
 Merge is complete!
-+ grep -q Merge is complete imerge-a-into-b-2-3.out
++ grep -q 'Merge is complete' imerge-a-into-b-2-3.out
 + git-imerge diagram --commits --frontier
        0   4
        |   |
@@ -9343,30 +10181,32 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge a into b (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:33 2024 +0000
+# Date:      Wed Jul 2 23:49:21 2025 +0000
 #
 # On branch a-into-b-2
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-2 7c98824] Merge a into b (using imerge)
- Date: Thu May 30 17:24:33 2024 +0000
+[a-into-b-2 8503be8] Merge a into b (using imerge)
+ Date: Wed Jul 2 23:49:21 2025 +0000
++ for n in 1 2 3
 + flip_flop_test 3
 + local n=3
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
-+ DESCRIPTION=git-imerge test repository with a commit and its revert at n=3
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3
++ DESCRIPTION='git-imerge test repository with a commit and its revert at n=3'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 'git-imerge test repository with a commit and its revert at n=3'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
-+ local description=git-imerge test repository with a commit and its revert at n=3
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 git-imerge test repository with a commit and its revert at n=3
++ local 'description=git-imerge test repository with a commit and its revert at n=3'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3 'git-imerge test repository with a commit and its revert at n=3'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
-+ local description=git-imerge test repository with a commit and its revert at n=3
++ local 'description=git-imerge test repository with a commit and its revert at n=3'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
@@ -9381,9 +10221,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/
-+ echo git-imerge test repository with a commit and its revert at n=3
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name Loú User
++ echo 'git-imerge test repository with a commit and its revert at n=3'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
@@ -9393,98 +10233,119 @@
 + text=0
 + echo 0
 + git add a.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) a733afa] m⇒0
  1 file changed, 1 insertion(+)
  create mode 100644 a.txt
 + git checkout -b a --
 Switched to a new branch 'a'
++ for i in 1 2 3
 + modify a.txt 1
 + filename=a.txt
 + text=1
 + echo 1
 + git add a.txt
-+ commit -m a⇒1 on branch a
++ commit -m 'a⇒1 on branch a'
++ TIME=1112911995
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m 'a⇒1 on branch a'
 [a 2f1f75a] a⇒1 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a⇒1 on branch a
++ for i in 1 2 3
 + modify a.txt 2
 + filename=a.txt
 + text=2
 + echo 2
 + git add a.txt
-+ commit -m a⇒2 on branch a
++ commit -m 'a⇒2 on branch a'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a⇒2 on branch a
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m 'a⇒2 on branch a'
+[a 4700669] a⇒2 on branch a
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-[a 4700669] a⇒2 on branch a
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ commit -m a⇒3 on branch a
++ commit -m 'a⇒3 on branch a'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a⇒3 on branch a
-+ git checkout -b b master --
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m 'a⇒3 on branch a'
 [a 621c381] a⇒3 on branch a
  1 file changed, 1 insertion(+), 1 deletion(-)
++ git checkout -b b master --
 Switched to a new branch 'b'
++ for i in 1 2 3 4
 + modify b.txt 1
 + filename=b.txt
 + text=1
 + echo 1
 + git add b.txt
-+ msg=b⇒1
++ msg=$'b\342\207\2221'
 + test 1 = 3
 + test 1 = 4
-+ commit -m b⇒1 on branch b
++ commit -m 'b⇒1 on branch b'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m b⇒1 on branch b
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'b⇒1 on branch b'
 [b 1f7d097] b⇒1 on branch b
  1 file changed, 1 insertion(+)
  create mode 100644 b.txt
++ for i in 1 2 3 4
 + modify b.txt 2
 + filename=b.txt
 + text=2
 + echo 2
 + git add b.txt
-+ msg=b⇒2
++ msg=$'b\342\207\2222'
 + test 2 = 3
 + test 2 = 4
-+ commit -m b⇒2 on branch b
++ commit -m 'b⇒2 on branch b'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m b⇒2 on branch b
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m 'b⇒2 on branch b'
 [b ce671e9] b⇒2 on branch b
  1 file changed, 1 insertion(+), 1 deletion(-)
++ for i in 1 2 3 4
 + modify b.txt 3
 + filename=b.txt
 + text=3
 + echo 3
 + git add b.txt
-+ msg=b⇒3
++ msg=$'b\342\207\2223'
 + test 3 = 3
 + modify a.txt X
 + filename=a.txt
 + text=X
 + echo X
 + git add a.txt
-+ msg=b⇒3 and a⇒X
++ msg='b⇒3 and a⇒X'
 + test 3 = 4
-+ commit -m b⇒3 and a⇒X on branch b
++ commit -m 'b⇒3 and a⇒X on branch b'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m b⇒3 and a⇒X on branch b
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m 'b⇒3 and a⇒X on branch b'
 [b d40495e] b⇒3 and a⇒X on branch b
  2 files changed, 2 insertions(+), 2 deletions(-)
++ for i in 1 2 3 4
 + modify b.txt 4
 + filename=b.txt
 + text=4
 + echo 4
 + git add b.txt
-+ msg=b⇒4
++ msg=$'b\342\207\2224'
 + test 4 = 3
 + test 4 = 4
 + modify a.txt 0
@@ -9492,10 +10353,14 @@
 + text=0
 + echo 0
 + git add a.txt
-+ msg=b⇒4 and a⇒0
-+ commit -m b⇒4 and a⇒0 on branch b
++ msg='b⇒4 and a⇒0'
++ commit -m 'b⇒4 and a⇒0 on branch b'
 + TIME=1112912001
-+ GIT_AUTHOR_DATE=@1112912001 +0000 GIT_COMMITTER_DATE=@1112912001 +0000 git commit -m b⇒4 and a⇒0 on branch b
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m 'b⇒4 and a⇒0 on branch b'
+[b eb736f2] b⇒4 and a⇒0 on branch b
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 + test_merge b-into-a-3 a b 1-3 1-4
 + local name=b-into-a-3
 + local dst=a
@@ -9503,11 +10368,9 @@
 + local conflict1=1-3
 + local conflict2=1-4
 + git checkout a
-[b eb736f2] b⇒4 and a⇒0 on branch b
- 2 files changed, 2 insertions(+), 2 deletions(-)
 Switched to branch 'a'
-+ tee imerge-b-into-a-3-1.out
 + git-imerge merge --branch=b-into-a-3 b
++ tee imerge-b-into-a-3-1.out
 Attempting automerge of 3-4...success.
 Autofilling 1-4...success.
 Autofilling 2-4...success.
@@ -9587,12 +10450,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-3 imerge-b-into-a-3-1.out
++ grep -q 'There was a conflict merging commit 1-3' imerge-b-into-a-3-1.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-b-into-a-3-2.out
-[imerge/b 6cac696] imerge 'b': manual merge 1-3
+[imerge/b 86f7a7d] imerge 'b': manual merge 1-3
 Merge has been recorded for merge 1-3.
 Attempting automerge of 1-4...failure.
 Attempting automerge of 1-4...failure.
@@ -9600,7 +10463,7 @@
 Autofilling 2-3...success.
 Autofilling 3-3...success.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,2:4].
-Previous HEAD position was ec4d9f3 imerge 'b': automatic merge 3-3
+Previous HEAD position was 28fab02 imerge 'b': automatic merge 3-3
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -9653,19 +10516,19 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 1-4 imerge-b-into-a-3-2.out
++ grep -q 'There was a conflict merging commit 1-4' imerge-b-into-a-3-2.out
 + echo 1
 + git add a.txt
 + git-imerge continue --no-edit
 + tee imerge-b-into-a-3-3.out
-[imerge/b dd0eea2] imerge 'b': manual merge 1-4
+[imerge/b 071aa96] imerge 'b': manual merge 1-4
 Merge has been recorded for merge 1-4.
 Attempting automerge of 3-4...success.
 Autofilling 2-4...success.
 Autofilling 3-4...success.
 Recording autofilled block MergeState('b', tip1='a', tip2='b', goal='merge')[1:4,3:5].
 Merge is complete!
-+ grep -q Merge is complete imerge-b-into-a-3-3.out
++ grep -q 'Merge is complete' imerge-b-into-a-3-3.out
 + git-imerge diagram --commits --frontier
        0  3
        |  |
@@ -9695,20 +10558,21 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge b into a (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:38 2024 +0000
+# Date:      Wed Jul 2 23:49:22 2025 +0000
 #
 # On branch b-into-a-3
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-3 77182c9] Merge b into a (using imerge)
- Date: Thu May 30 17:24:38 2024 +0000
+[b-into-a-3 942103e] Merge b into a (using imerge)
+ Date: Wed Jul 2 23:49:22 2025 +0000
 + test_merge a-into-b-3 b a 3-1 4-1
 + local name=a-into-b-3
 + local dst=b
@@ -9717,8 +10581,8 @@
 + local conflict2=4-1
 + git checkout b
 Switched to branch 'b'
-+ tee imerge-a-into-b-3-1.out
 + git-imerge merge --branch=a-into-b-3 a
++ tee imerge-a-into-b-3-1.out
 Attempting automerge of 4-3...success.
 Autofilling 1-3...success.
 Autofilling 2-3...success.
@@ -9782,12 +10646,12 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 3-1 imerge-a-into-b-3-1.out
++ grep -q 'There was a conflict merging commit 3-1' imerge-a-into-b-3-1.out
 + echo 1
 + git add a.txt
-+ tee imerge-a-into-b-3-2.out
 + git-imerge continue --no-edit
-[imerge/a c5c564f] imerge 'a': manual merge 3-1
++ tee imerge-a-into-b-3-2.out
+[imerge/a 5a5ab7c] imerge 'a': manual merge 3-1
 Merge has been recorded for merge 3-1.
 Attempting automerge of 3-3...success.
 Autofilling 3-2...success.
@@ -9845,19 +10709,19 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ grep -q There was a conflict merging commit 4-1 imerge-a-into-b-3-2.out
++ grep -q 'There was a conflict merging commit 4-1' imerge-a-into-b-3-2.out
 + echo 1
 + git add a.txt
-+ tee imerge-a-into-b-3-3.out
 + git-imerge continue --no-edit
-[imerge/a b8e01bc] imerge 'a': manual merge 4-1
++ tee imerge-a-into-b-3-3.out
+[imerge/a f407b1c] imerge 'a': manual merge 4-1
 Merge has been recorded for merge 4-1.
 Attempting automerge of 4-3...success.
 Autofilling 4-2...success.
 Autofilling 4-3...success.
 Recording autofilled block MergeState('a', tip1='b', tip2='a', goal='merge')[3:5,1:4].
 Merge is complete!
-+ grep -q Merge is complete imerge-a-into-b-3-3.out
++ grep -q 'Merge is complete' imerge-a-into-b-3-3.out
 + git-imerge diagram --commits --frontier
        0   4
        |   |
@@ -9885,36 +10749,37 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ GIT_EDITOR=cat git-imerge finish
++ GIT_EDITOR=cat
++ git-imerge finish
 Merge a into b (using imerge)
 
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# Date:      Thu May 30 17:24:40 2024 +0000
+# Date:      Wed Jul 2 23:49:23 2025 +0000
 #
 # On branch a-into-b-3
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-3 e63f413] Merge a into b (using imerge)
- Date: Thu May 30 17:24:40 2024 +0000
+[a-into-b-3 bb87c12] Merge a into b (using imerge)
+ Date: Wed Jul 2 23:49:23 2025 +0000
 py311: commands[5] .pybuild/cpython3_3.11/build> /bin/sh t/test-drop
-+ dirname t/test-drop
-+ cd t
-+ pwd
-+ dirname /build/reproducible-path/git-imerge-1.2.0/t
+++++ dirname t/test-drop
++++ cd t
++++ pwd
+++ dirname /build/reproducible-path/git-imerge-1.2.0/t
 + BASE=/build/reproducible-path/git-imerge-1.2.0
 + . /build/reproducible-path/git-imerge-1.2.0/t/test-lib.sh
 + GIT_IMERGE=git-imerge
 + TMP=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
-+ DESCRIPTION=git-imerge drop test repository
-+ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository
++ DESCRIPTION='git-imerge drop test repository'
++ init_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
-+ local description=git-imerge drop test repository
-+ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop git-imerge drop test repository
++ local 'description=git-imerge drop test repository'
++ delete_test_repo /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop 'git-imerge drop test repository'
 + local path=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
-+ local description=git-imerge drop test repository
++ local 'description=git-imerge drop test repository'
 + test -d /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
 + mkdir -p /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
@@ -9929,9 +10794,9 @@
 hint: 
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git/
-+ echo git-imerge drop test repository
-+ printf %s\n /*.out /*.css /*.html
-+ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name Loú User
++ echo 'git-imerge drop test repository'
++ printf '%s\n' '/*.out' '/*.css' '/*.html'
++ git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.name 'Loú User'
 + git --git-dir=/build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.git config user.email luser@example.com
 + TIME=1112911993
 + ln -s /build/reproducible-path/git-imerge-1.2.0/imerge.css /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop
@@ -9941,76 +10806,96 @@
 + text=0
 + echo 0
 + git add a.txt
-+ commit -m m⇒0
++ commit -m $'m\342\207\2220'
 + TIME=1112911994
-+ GIT_AUTHOR_DATE=@1112911994 +0000 GIT_COMMITTER_DATE=@1112911994 +0000 git commit -m m⇒0
++ GIT_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
 [master (root-commit) a733afa] m⇒0
  1 file changed, 1 insertion(+)
  create mode 100644 a.txt
-+ seq 6
+++ seq 6
++ for i in $(seq 6)
 + modify a1.txt 1
 + filename=a1.txt
 + text=1
 + echo 1
 + git add a1.txt
-+ commit -m a1⇒1
++ commit -m $'a1\342\207\2221'
 + TIME=1112911995
-+ GIT_AUTHOR_DATE=@1112911995 +0000 GIT_COMMITTER_DATE=@1112911995 +0000 git commit -m a1⇒1
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'a1\342\207\2221'
 [master 389a4ba] a1⇒1
  1 file changed, 1 insertion(+)
  create mode 100644 a1.txt
++ for i in $(seq 6)
 + modify a2.txt 2
 + filename=a2.txt
 + text=2
 + echo 2
 + git add a2.txt
-+ commit -m a2⇒2
++ commit -m $'a2\342\207\2222'
 + TIME=1112911996
-+ GIT_AUTHOR_DATE=@1112911996 +0000 GIT_COMMITTER_DATE=@1112911996 +0000 git commit -m a2⇒2
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'a2\342\207\2222'
 [master 4785218] a2⇒2
  1 file changed, 1 insertion(+)
  create mode 100644 a2.txt
++ for i in $(seq 6)
 + modify a3.txt 3
 + filename=a3.txt
 + text=3
 + echo 3
 + git add a3.txt
++ commit -m $'a3\342\207\2223'
++ TIME=1112911997
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'a3\342\207\2223'
 [master 34bdde3] a3⇒3
  1 file changed, 1 insertion(+)
  create mode 100644 a3.txt
-+ commit -m a3⇒3
-+ TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3
++ for i in $(seq 6)
 + modify a4.txt 4
 + filename=a4.txt
 + text=4
 + echo 4
 + git add a4.txt
-+ commit -m a4⇒4
++ commit -m $'a4\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a4⇒4
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'a4\342\207\2224'
+[master c793a5a] a4⇒4
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a4.txt
++ for i in $(seq 6)
 + modify a5.txt 5
 + filename=a5.txt
 + text=5
 + echo 5
 + git add a5.txt
-[master c793a5a] a4⇒4
- 1 file changed, 1 insertion(+)
- create mode 100644 a4.txt
-+ commit -m a5⇒5
++ commit -m $'a5\342\207\2225'
 + TIME=1112911999
-+ GIT_AUTHOR_DATE=@1112911999 +0000 GIT_COMMITTER_DATE=@1112911999 +0000 git commit -m a5⇒5
++ GIT_AUTHOR_DATE='@1112911999 +0000'
++ GIT_COMMITTER_DATE='@1112911999 +0000'
++ git commit -m $'a5\342\207\2225'
+[master b42f60c] a5⇒5
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a5.txt
++ for i in $(seq 6)
 + modify a6.txt 6
 + filename=a6.txt
 + text=6
 + echo 6
 + git add a6.txt
-[master b42f60c] a5⇒5
- 1 file changed, 1 insertion(+)
- create mode 100644 a5.txt
-+ commit -m a6⇒6
++ commit -m $'a6\342\207\2226'
 + TIME=1112912000
-+ GIT_AUTHOR_DATE=@1112912000 +0000 GIT_COMMITTER_DATE=@1112912000 +0000 git commit -m a6⇒6
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'a6\342\207\2226'
 [master 9d6aec5] a6⇒6
  1 file changed, 1 insertion(+)
  create mode 100644 a6.txt
@@ -10035,12 +10920,12 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 34bdde3 a3⇒3
-[detached HEAD 5b4d588] Revert "a3⇒3"
- Date: Thu May 30 17:24:41 2024 +0000
+[detached HEAD 6c8215d] Revert "a3⇒3"
+ Date: Wed Jul 2 23:49:23 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a3.txt
-[detached HEAD 566e6ec] Revert "a2⇒2"
- Date: Thu May 30 17:24:41 2024 +0000
+[detached HEAD 339b525] Revert "a2⇒2"
+ Date: Wed Jul 2 23:49:23 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a2.txt
 Attempting automerge of 3-2...success.
@@ -10050,7 +10935,7 @@
 Autofilling 3-2 (first way)...success.
 Autofilling 3-2 (second way)...success.
 The two ways of autofilling 3-2 agree.
-Recording autofilled block MergeState('dropped', tip1='dropped', tip2='566e6ec2033e4683bed5b4602bde241c270c0f3c', goal='drop')[0:4,0:3].
+Recording autofilled block MergeState('dropped', tip1='dropped', tip2='339b5252a4025f8cbc7572b2184aef310da50717', goal='drop')[0:4,0:3].
 Merge is complete!
 + git-imerge diagram --commits --frontier --html=imerge-drop.html
        0  3
@@ -10059,7 +10944,7 @@
        *??.
    2 - *...
        |
-     566e6ec2033e4683bed5b4602bde241c270c0f3c
+     339b5252a4025f8cbc7572b2184aef310da50717
 
        0  3
        |  |
@@ -10067,7 +10952,7 @@
        *??|
    2 - *--+
        |
-     566e6ec2033e4683bed5b4602bde241c270c0f3c
+     339b5252a4025f8cbc7572b2184aef310da50717
 
 Key:
   |,-,+ = rectangles forming current merge frontier
@@ -10081,7 +10966,7 @@
 + check_tree dropped 3b92d9e80adb5b542a651863e6853ff5de9e496b
 + local refname=dropped
 + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b
-+ git rev-parse dropped^{tree}
+++ git rev-parse 'dropped^{tree}'
 + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b
 + git checkout -b reverted master
 Switched to a new branch 'reverted'
@@ -10104,12 +10989,12 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 34bdde3 a3⇒3
-[detached HEAD d380cd2] Revert "a3⇒3"
- Date: Thu May 30 17:24:43 2024 +0000
+[detached HEAD a60be2a] Revert "a3⇒3"
+ Date: Wed Jul 2 23:49:24 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a3.txt
-[detached HEAD b5d86c1] Revert "a2⇒2"
- Date: Thu May 30 17:24:43 2024 +0000
+[detached HEAD 4beb5e2] Revert "a2⇒2"
+ Date: Wed Jul 2 23:49:24 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a2.txt
 Attempting automerge of 3-2...success.
@@ -10119,7 +11004,7 @@
 Autofilling 3-2 (first way)...success.
 Autofilling 3-2 (second way)...success.
 The two ways of autofilling 3-2 agree.
-Recording autofilled block MergeState('reverted', tip1='reverted', tip2='b5d86c104fd82aedd44da65df19e2cb911575bd5', goal='revert')[0:4,0:3].
+Recording autofilled block MergeState('reverted', tip1='reverted', tip2='4beb5e2bc1dc03f9e7978021e2d1a19eaca0f27e', goal='revert')[0:4,0:3].
 Merge is complete!
 + git-imerge diagram --commits --frontier --html=imerge-revert.html
        0  3
@@ -10128,7 +11013,7 @@
        *??.
    2 - *...
        |
-     b5d86c104fd82aedd44da65df19e2cb911575bd5
+     4beb5e2bc1dc03f9e7978021e2d1a19eaca0f27e
 
        0  3
        |  |
@@ -10136,7 +11021,7 @@
        *??|
    2 - *--+
        |
-     b5d86c104fd82aedd44da65df19e2cb911575bd5
+     4beb5e2bc1dc03f9e7978021e2d1a19eaca0f27e
 
 Key:
   |,-,+ = rectangles forming current merge frontier
@@ -10150,10 +11035,10 @@
 + check_tree reverted 3b92d9e80adb5b542a651863e6853ff5de9e496b
 + local refname=reverted
 + local expected_tree=3b92d9e80adb5b542a651863e6853ff5de9e496b
-+ git rev-parse reverted^{tree}
+++ git rev-parse 'reverted^{tree}'
 + test 3b92d9e80adb5b542a651863e6853ff5de9e496b = 3b92d9e80adb5b542a651863e6853ff5de9e496b
-  py311: OK (154.22=setup[4.97]+cmd[11.45,92.84,13.23,5.53,22.83,3.37] seconds)
-  congratulations :) (154.53 seconds)
+  py311: OK (51.09=setup[1.81]+cmd[2.35,33.03,5.19,1.74,6.18,0.79] seconds)
+  congratulations :) (51.19 seconds)
    create-stamp debian/debhelper-build-stamp
    dh_testroot -O--buildsystem=pybuild
    dh_prep -O--buildsystem=pybuild
@@ -10223,12 +11108,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/114137/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/4284 and its subdirectories
-I: Current time: Thu May 30 05:24:55 -12 2024
-I: pbuilder-time-stamp: 1717089895
+I: removing directory /srv/workspace/pbuilder/114137 and its subdirectories
+I: Current time: Thu Jul  3 13:49:28 +14 2025
+I: pbuilder-time-stamp: 1751500168