Diff of the two buildlogs:

--
--- b1/build.log	2024-11-17 02:18:19.611645013 +0000
+++ b2/build.log	2024-11-17 02:25:18.328629305 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sat Nov 16 14:16:14 -12 2024
-I: pbuilder-time-stamp: 1731809774
+I: Current time: Sat Dec 20 22:41:22 +14 2025
+I: pbuilder-time-stamp: 1766220082
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -27,52 +27,84 @@
 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/4109875/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/1456233/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink03-arm64.
+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 Dec 20 08:41 /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/1456233/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/1456233/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='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  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]="32" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.32(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='171150ea1e374bdcb4d0e8aab30372d9'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  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='4109875'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=b34c54592405473081b2989ffcfefaa2
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-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=1456233
   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.30QnChul/pbuilderrc_qnY0 --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.30QnChul/b1 --logfile b1/build.log git-imerge_1.2.0-5.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4: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.30QnChul/pbuilderrc_gqZI --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.30QnChul/b2 --logfile b2/build.log git-imerge_1.2.0-5.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink02-arm64 6.1.0-27-cloud-arm64 #1 SMP Debian 6.1.115-1 (2024-11-01) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-27-cloud-arm64 #1 SMP Debian 6.1.115-1 (2024-11-01) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Aug  4 21:30 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/4109875/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Aug  4  2024 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/1456233/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -226,7 +258,7 @@
 Get: 100 http://deb.debian.org/debian trixie/main arm64 python3-virtualenv all 20.27.0+ds-1 [71.1 kB]
 Get: 101 http://deb.debian.org/debian trixie/main arm64 python3-wheel all 0.44.0-2 [53.4 kB]
 Get: 102 http://deb.debian.org/debian trixie/main arm64 tox all 4.23.0-1 [393 kB]
-Fetched 46.1 MB in 0s (160 MB/s)
+Fetched 46.1 MB in 1s (82.2 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libpython3.12-minimal:arm64.
 (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 ... 20089 files and directories currently installed.)
@@ -571,8 +603,8 @@
 Setting up tzdata (2024b-3) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Sun Nov 17 02:16:33 UTC 2024.
-Universal Time is now:  Sun Nov 17 02:16:33 UTC 2024.
+Local time is now:      Sat Dec 20 08:42:01 UTC 2025.
+Universal Time is now:  Sat Dec 20 08:42:01 UTC 2025.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17029-2) ...
@@ -670,7 +702,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/1456233/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/1456233/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
@@ -762,25 +798,24 @@
 I: pybuild base:311: cd /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/build; tox -c /build/reproducible-path/git-imerge-1.2.0/tox.ini --sitepackages -e py312 -x testenv.passenv+=_PYTHON_HOST_PLATFORM --installpkg /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/git_imerge-1.2.0-py3-none-any.whl 
 py312: install_package .pybuild/cpython3_3.12/build> python -I -m pip install --force-reinstall --no-deps /build/reproducible-path/git-imerge-1.2.0/.pybuild/cpython3_3.12/git_imerge-1.2.0-py3-none-any.whl
 py312: commands[0] .pybuild/cpython3_3.12/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
-Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/unconflicted/.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:
@@ -791,9 +826,10 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-+ 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
+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'
 + 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
@@ -808,147 +844,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
-+ 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
-[a dcbe282] a⇒2
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'a\342\207\2222'
++ for i in $(seq 8)
 + modify a.txt 3
 + filename=a.txt
 + text=3
 + echo 3
 + git add a.txt
-+ commit -m a⇒3
+[a dcbe282] a⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-+ commit -m a⇒4
++ commit -m $'a\342\207\2224'
 + TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m a⇒4
++ 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(-)
++ 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
-+ 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
 + 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
-+ 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
@@ -1005,54 +1082,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:      Sun Nov 17 02:16:52 2024 +0000
+# Date:      Sat Dec 20 08:43:05 2025 +0000
 #
 # On branch a-b-merge
 # Changes to be committed:
 #	modified:   b.txt
 #
-[a-b-merge aaf0406] Merge b into a (using imerge)
- Date: Sun Nov 17 02:16:52 2024 +0000
+[a-b-merge 9504004] Merge b into a (using imerge)
+ Date: Sat Dec 20 08:43:05 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
@@ -1136,13 +1214,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
 py312: commands[1] .pybuild/cpython3_3.12/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
@@ -1150,30 +1228,30 @@
 + 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:
 hint:
 hint: 	git config --global init.defaultBranch <name>
-Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-4-3/.git/
 hint:
 hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
 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
++ 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
@@ -1188,14 +1266,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
@@ -1203,171 +1283,231 @@
  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
-+ 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
++ 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
-[c d8de99f] c⇒8
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912002 +0000'
++ GIT_COMMITTER_DATE='@1112912002 +0000'
++ git commit -m $'c\342\207\2228'
++ for i in $(seq 9)
 + modify c.txt 9
 + filename=c.txt
 + text=9
 + echo 9
 + git add c.txt
-+ commit -m c⇒9
+[c d8de99f] c⇒8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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 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
 + 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
-[d 2bb1a7e] d⇒3
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
+[d 2bb1a7e] d⇒3
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ 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'
++ git checkout c
 [d 8085853] d⇒6
  1 file changed, 1 insertion(+), 1 deletion(-)
-+ git checkout c
 Switched to branch 'c'
 + git-imerge init --name=c-d d
 + git-imerge list
@@ -1446,7 +1586,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
        |    |   |
@@ -1487,13 +1627,13 @@
 Automatic merge failed; fix conflicts and then commit the result.
 
 Original first commit:
+
+Original second commit:
 commit 3c091ded129a5edf9061360bab867edade996c93
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:18 2005 +0000
 
     c⇒4
-
-Original second commit:
 commit 2bb1a7e7c5451146af7dc59b69b8289c76a3ee7b
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:26 2005 +0000
@@ -1504,10 +1644,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 8f23c55] imerge 'c-d': manual merge 4-3
+[imerge/c-d c309a46] 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.
@@ -1560,61 +1700,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:      Sun Nov 17 02:16:57 2024 +0000
+# Date:      Sat Dec 20 08:43:26 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge e0f6d6d] Merge d into c (using imerge)
- Date: Sun Nov 17 02:16:57 2024 +0000
+[c-d-merge 4e853bb] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:43:26 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'
-+ git-imerge+  start --goal=full --first-parent --name=c-d d
-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.
@@ -1646,7 +1787,7 @@
 Attempting to merge 8-2...success.
 Attempting to merge 9-1...success.
 Attempting to merge 9-2...success.
-Previous HEAD position was f3d7b82 imerge 'c-d': automatic merge 9-2
+Previous HEAD position was a7624de imerge 'c-d': automatic merge 9-2
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -1671,7 +1812,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
        |    |   |
@@ -1705,9 +1846,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:
@@ -1729,7 +1871,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 6833400] imerge 'c-d': manual merge 4-3
+[imerge/c-d d58a4f7] imerge 'c-d': manual merge 4-3
 + git-imerge continue --edit
 Merge has been recorded for merge 4-3.
 Attempting to merge 4-4...success.
@@ -1793,21 +1935,22 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-1/.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:
@@ -1818,10 +1961,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-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
++ 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
@@ -1836,14 +1978,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
@@ -1851,168 +1995,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
-[c 2120f40] c⇒1
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
+[c 2120f40] c⇒1
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ 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
-[c 2046ed2] c⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
+[c 2046ed2] c⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-[c 30dd2ae] c⇒6
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912000 +0000'
++ GIT_COMMITTER_DATE='@1112912000 +0000'
++ git commit -m $'c\342\207\2226'
++ for i in $(seq 9)
 + modify c.txt 7
 + filename=c.txt
 + text=7
 + echo 7
 + git add c.txt
-+ commit -m c⇒7
+[c 30dd2ae] c⇒6
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-+ 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
-+ 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
@@ -2060,7 +2264,7 @@
 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
        |    |   |
@@ -2118,10 +2322,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 c3a9ce3] imerge 'c-d': manual merge 1-1
+[imerge/c-d 280980d] 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.
@@ -2181,61 +2385,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:      Sun Nov 17 02:17:03 2024 +0000
+# Date:      Sat Dec 20 08:43:48 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge da9e7b8] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:03 2024 +0000
+[c-d-merge 6752a8c] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:43:48 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'
-+ git-imerge start --goal=full --first-parent --name=c-d d
 + tee start.out
++ git-imerge start --goal=full --first-parent --name=c-d d
 Attempting to merge 1-1...conflict.
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
@@ -2261,7 +2466,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
        |    |   |
@@ -2295,9 +2500,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:
@@ -2319,7 +2525,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 2db2c56] imerge 'c-d': manual merge 1-1
+[imerge/c-d 864d1e9] imerge 'c-d': manual merge 1-1
 + git-imerge continue --edit
 Merge has been recorded for merge 1-1.
 Attempting to merge 1-2...success.
@@ -2413,20 +2619,21 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1/.git/
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-1
 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
@@ -2438,10 +2645,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -2456,14 +2662,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
@@ -2471,168 +2679,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(-)
++ 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
-[c ed9122f] c⇒4
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
++ for i in $(seq 9)
 + modify c.txt 5
 + filename=c.txt
 + text=5
 + echo 5
 + git add c.txt
-+ commit -m c⇒5
+[c ed9122f] c⇒4
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-+ 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
-[d ac0427a] d⇒1
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
+[d ac0427a] d⇒1
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ 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
-[d 43c38c0] d⇒2
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
+[d 43c38c0] d⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
@@ -2673,8 +2941,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.
@@ -2705,7 +2973,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
        |    |   |
@@ -2763,10 +3031,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 f9bedef] imerge 'c-d': manual merge 9-1
+[imerge/c-d 7ed8316] 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.
@@ -2809,55 +3077,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:      Sun Nov 17 02:17:09 2024 +0000
+# Date:      Sat Dec 20 08:44:10 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge e9c7ad8] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:09 2024 +0000
+[c-d-merge 4270c86] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:44:10 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
@@ -2937,7 +3206,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
        |    |   |
@@ -2971,9 +3240,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:
@@ -2995,7 +3265,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 549b488] imerge 'c-d': manual merge 9-1
+[imerge/c-d 5e85378] imerge 'c-d': manual merge 9-1
 + git-imerge continue --edit
 Merge has been recorded for merge 9-1.
 Attempting to merge 9-2...success.
@@ -3041,21 +3311,22 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-6/.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:
@@ -3066,10 +3337,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-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
++ 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
@@ -3084,14 +3354,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
@@ -3099,168 +3371,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
-[c 2120f40] c⇒1
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
++ for i in $(seq 9)
 + modify c.txt 2
 + filename=c.txt
 + text=2
 + echo 2
 + git add c.txt
-+ commit -m c⇒2
+[c 2120f40] c⇒1
+ 2 files changed, 2 insertions(+), 2 deletions(-)
++ 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
-+ 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
@@ -3330,7 +3662,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
        |    |   |
@@ -3371,27 +3703,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
 
-Original second commit:
+There was a conflict merging commit 1-6, shown above.
+Please resolve the conflict, commit the result, then type
+
+    git-imerge continue
 commit f7e451a6c9656dda15641a9fbc591a602f158692
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:29 2005 +0000
 
     d⇒6
-
-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
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d fc1673f] imerge 'c-d': manual merge 1-6
+[imerge/c-d 691aaa1] 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.
@@ -3437,55 +3769,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:      Sun Nov 17 02:17:16 2024 +0000
+# Date:      Sat Dec 20 08:44:33 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge b907c37] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:16 2024 +0000
+[c-d-merge 3c0560c] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:44:33 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
@@ -3538,7 +3871,7 @@
 Attempting to merge 9-3...success.
 Attempting to merge 9-4...success.
 Attempting to merge 9-5...success.
-Previous HEAD position was 966ef2f imerge 'c-d': automatic merge 9-5
+Previous HEAD position was dcbdbea imerge 'c-d': automatic merge 9-5
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -3563,7 +3896,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
        |    |   |
@@ -3597,9 +3930,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:
@@ -3621,7 +3955,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d d9fe2c4] imerge 'c-d': manual merge 1-6
+[imerge/c-d 133a914] 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.
@@ -3670,18 +4004,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
@@ -3696,9 +4030,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
@@ -3713,14 +4047,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
@@ -3728,168 +4064,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 7c431f2] c⇒2
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911996 +0000'
++ GIT_COMMITTER_DATE='@1112911996 +0000'
++ git commit -m $'c\342\207\2222'
++ for i in $(seq 9)
 + modify c.txt 3
 + filename=c.txt
 + text=3
 + echo 3
 + git add c.txt
-+ commit -m c⇒3
+[c 7c431f2] c⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-[c 7050a8a] c⇒7
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912001 +0000'
++ GIT_COMMITTER_DATE='@1112912001 +0000'
++ git commit -m $'c\342\207\2227'
++ for i in $(seq 9)
 + modify c.txt 8
 + filename=c.txt
 + text=8
 + echo 8
 + git add c.txt
-+ commit -m c⇒8
+[c 7050a8a] c⇒7
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-[d bd5368a] d⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
++ for i in $(seq 6)
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ commit -m d⇒2
-+ TIME=1112912005
-+ GIT_AUTHOR_DATE=@1112912005 +0000 GIT_COMMITTER_DATE=@1112912005 +0000 git commit -m d⇒2
-[d 93e27e6] d⇒2
+[d bd5368a] d⇒1
  1 file changed, 1 insertion(+), 1 deletion(-)
++ 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'
++ for i in $(seq 6)
 + modify d.txt 3
 + filename=d.txt
 + text=3
 + echo 3
 + git add d.txt
-+ commit -m d⇒3
+[d 93e27e6] d⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
@@ -3970,7 +4366,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
        |    |   |
@@ -4028,10 +4424,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 9726e51] imerge 'c-d': manual merge 9-6
+[imerge/c-d 8057982] 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
@@ -4067,55 +4463,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:      Sun Nov 17 02:17:23 2024 +0000
+# Date:      Sat Dec 20 08:44:56 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge acd58f7] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:23 2024 +0000
+[c-d-merge 2abd836] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:44:56 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
@@ -4200,7 +4597,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
        |    |   |
@@ -4234,9 +4631,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:
@@ -4258,7 +4656,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d 879dcac] imerge 'c-d': manual merge 9-6
+[imerge/c-d e81fbed] imerge 'c-d': manual merge 9-6
 + git-imerge continue --edit
 Merge has been recorded for merge 9-6.
 Merge is complete!
@@ -4299,20 +4697,21 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2/.git/
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-1-2
 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
@@ -4324,10 +4723,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -4342,14 +4740,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
@@ -4357,168 +4757,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
@@ -4559,8 +5019,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.
@@ -4582,7 +5042,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
        |    |   |
@@ -4618,11 +5078,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
@@ -4630,20 +5090,20 @@
     c⇒1
 
 Original second commit:
-commit 69efde8f66d581a765a3909ffacb9f895f95c345
-Author: Loú User <luser@example.com>
-Date:   Thu Apr 7 22:13:25 2005 +0000
-
-    d⇒2
 
 There was a conflict merging commit 1-2, shown above.
 Please resolve the conflict, commit the result, then type
 
     git-imerge continue
-+ echo merged version
+commit 69efde8f66d581a765a3909ffacb9f895f95c345
+Author: Loú User <luser@example.com>
+Date:   Thu Apr 7 22:13:25 2005 +0000
+
+    d⇒2
++ echo 'merged version'
 + git add conflict.txt
 + git-imerge continue --no-edit
-[imerge/c-d a7e1985] imerge 'c-d': manual merge 1-2
+[imerge/c-d a6004ea] 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.
@@ -4701,55 +5161,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:      Sun Nov 17 02:17:30 2024 +0000
+# Date:      Sat Dec 20 08:45:21 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 15429b3] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:30 2024 +0000
+[c-d-merge d83a6e7] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:45:21 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
@@ -4766,7 +5227,7 @@
 Attempting to merge 7-1...success.
 Attempting to merge 8-1...success.
 Attempting to merge 9-1...success.
-Previous HEAD position was 21a3d1c imerge 'c-d': automatic merge 9-1
+Previous HEAD position was 4eb21e7 imerge 'c-d': automatic merge 9-1
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -4791,7 +5252,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
        |    |   |
@@ -4825,9 +5286,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:
@@ -4849,8 +5311,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d c746f9d] imerge 'c-d': manual merge 1-2
 + git-imerge continue --edit
+[imerge/c-d 31a3e50] imerge 'c-d': manual merge 1-2
 Merge has been recorded for merge 1-2.
 Attempting to merge 1-3...success.
 Attempting to merge 1-4...success.
@@ -4934,21 +5396,22 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-9-5/.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:
@@ -4959,10 +5422,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -4977,14 +5439,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
@@ -4992,170 +5456,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
-[c f02ab24] c⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'c\342\207\2223'
++ for i in $(seq 9)
 + modify c.txt 4
 + filename=c.txt
 + text=4
 + echo 4
 + git add c.txt
-+ commit -m c⇒4
+[c f02ab24] c⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
-[d 93e27e6] d⇒2
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912005 +0000'
++ GIT_COMMITTER_DATE='@1112912005 +0000'
++ git commit -m $'d\342\207\2222'
++ 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 133f385] d⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
-+ TIME=1112912007
-+ GIT_AUTHOR_DATE=@1112912007 +0000 GIT_COMMITTER_DATE=@1112912007 +0000 git commit -m d⇒4
+[d 93e27e6] d⇒2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[d 133f385] d⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 [d 586472a] d⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
+[d 0a6f956] d⇒5
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+[d bfb30f0] d⇒6
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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\342\207\2224'
++ 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
-[d 0a6f956] d⇒5
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ GIT_AUTHOR_DATE='@1112912008 +0000'
++ GIT_COMMITTER_DATE='@1112912008 +0000'
++ git commit -m $'d\342\207\2225'
++ 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
-[d bfb30f0] d⇒6
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912009 +0000'
++ GIT_COMMITTER_DATE='@1112912009 +0000'
++ git commit -m $'d\342\207\2226'
 + git checkout c
 Switched to branch 'c'
 + git-imerge init --name=c-d d
@@ -5233,7 +5757,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
        |    |   |
@@ -5269,32 +5793,32 @@
 
 + 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:
+Original second commit:
 commit 73a5eedb087a0f656d730831b8def7943b40f3cf
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:23 2005 +0000
 
     c⇒9
 
-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
 commit 0a6f956bd00cebb5567e80d6ee247a51128ad36f
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:28 2005 +0000
 
     d⇒5
-
-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 7909ea4] imerge 'c-d': manual merge 9-5
+[imerge/c-d 7449551] 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.
@@ -5333,61 +5857,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:      Sun Nov 17 02:17:36 2024 +0000
+# Date:      Sat Dec 20 08:45:45 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 2c88ab4] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:36 2024 +0000
+[c-d-merge 7651432] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:45: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'
-+ git-imerge start --goal=full --first-parent --name=c-d d
 + tee start.out
++ git-imerge start --goal=full --first-parent --name=c-d d
 Attempting to merge 1-1...success.
 Attempting to merge 1-2...success.
 Attempting to merge 1-3...success.
@@ -5465,7 +5990,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
        |    |   |
@@ -5499,9 +6024,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:
@@ -5523,8 +6049,8 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d ee4a85c] imerge 'c-d': manual merge 9-5
 + git-imerge continue --edit
+[imerge/c-d 43f71b4] imerge 'c-d': manual merge 9-5
 Merge has been recorded for merge 9-5.
 Attempting to merge 9-6...success.
 Merge is complete!
@@ -5565,21 +6091,22 @@
 + 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-5-1/.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:
@@ -5590,10 +6117,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-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
++ 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
@@ -5608,14 +6134,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
@@ -5623,168 +6151,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(-)
++ 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
-+ TIME=1112911998
-+ GIT_AUTHOR_DATE=@1112911998 +0000 GIT_COMMITTER_DATE=@1112911998 +0000 git commit -m c⇒4
++ case $conflict in
++ commit -m $'c\342\207\2224'
 [c ed9122f] c⇒4
  1 file changed, 1 insertion(+), 1 deletion(-)
++ TIME=1112911998
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m $'c\342\207\2224'
++ 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
-+ 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 df3c57a] 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 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
-+ 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 44473d6] 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 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
-+ 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
-[d 0260058] d⇒3
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112912006 +0000'
++ GIT_COMMITTER_DATE='@1112912006 +0000'
++ git commit -m $'d\342\207\2223'
++ for i in $(seq 6)
 + modify d.txt 4
 + filename=d.txt
 + text=4
 + echo 4
 + git add d.txt
-+ commit -m d⇒4
+[d 0260058] d⇒3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
@@ -5825,8 +6413,8 @@
   @ = merge was blocked but has been resolved
   ? = no merge recorded
 
-+ git-imerge autofill
 + tee autofill.out
++ git-imerge autofill
 Attempting automerge of 9-6...failure.
 Attempting automerge of 1-1...success.
 Attempting automerge of 1-4...success.
@@ -5853,7 +6441,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
        |    |   |
@@ -5889,11 +6477,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 7e31f254c318decc434628f023dac0703f3d2b9e
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:19 2005 +0000
@@ -5911,10 +6499,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 3465036] imerge 'c-d': manual merge 5-1
+[imerge/c-d aa9c2c5] 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.
@@ -5970,55 +6558,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:      Sun Nov 17 02:17:43 2024 +0000
+# Date:      Sat Dec 20 08:46:09 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge fe822a0] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:43 2024 +0000
+[c-d-merge ee3dbb1] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:46:09 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
@@ -6074,7 +6663,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
        |    |   |
@@ -6108,9 +6697,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:
@@ -6132,7 +6722,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d e0f3635] imerge 'c-d': manual merge 5-1
+[imerge/c-d 76cb4f4] 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.
@@ -6202,18 +6792,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
@@ -6228,9 +6818,9 @@
 hint:
 hint: 	git branch -m <name>
 Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/conflicted-6-6/.git/
-+ 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
++ 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
@@ -6245,14 +6835,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
@@ -6260,168 +6852,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
-[c 89e2141] c⇒1
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'c\342\207\2221'
++ 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(-)
++ 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
++ 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
++ 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
@@ -6505,7 +7157,7 @@
 HEAD is now at 70408c8 c⇒9
 Conflict; suggest manual merge of 6-6
 + grep -q Traceback autofill.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=imerge1.html
        0    5   9
        |    |   |
@@ -6543,9 +7195,9 @@
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
 
 Original first commit:
-Automatic merge failed; fix conflicts and then commit the result.
 commit fe4fed83ab13bbc7e9ee5ef0a814b170b8194854
 Author: Loú User <luser@example.com>
 Date:   Thu Apr 7 22:13:20 2005 +0000
@@ -6563,10 +7215,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 b7b3dc5] imerge 'c-d': manual merge 6-6
+[imerge/c-d 1bcd1e9] 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.
@@ -6607,55 +7259,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:      Sun Nov 17 02:17:50 2024 +0000
+# Date:      Sat Dec 20 08:46:32 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[c-d-merge 477428b] Merge d into c (using imerge)
- Date: Sun Nov 17 02:17:50 2024 +0000
+[c-d-merge 731ab51] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:46:32 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
@@ -6713,7 +7366,7 @@
 Attempting to merge 9-3...success.
 Attempting to merge 9-4...success.
 Attempting to merge 9-5...success.
-Previous HEAD position was 491e364 imerge 'c-d': automatic merge 9-5
+Previous HEAD position was bfc3209 imerge 'c-d': automatic merge 9-5
 Switched to branch 'imerge/c-d'
 Auto-merging conflict.txt
 CONFLICT (content): Merge conflict in conflict.txt
@@ -6738,7 +7391,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
        |    |   |
@@ -6772,9 +7425,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:
@@ -6796,7 +7450,7 @@
 #	modified:   conflict.txt
 #	modified:   d.txt
 #
-[imerge/c-d b78f813] imerge 'c-d': manual merge 6-6
+[imerge/c-d edf3af1] imerge 'c-d': manual merge 6-6
 + git-imerge continue --edit
 Merge has been recorded for merge 6-6.
 Attempting to merge 7-6...success.
@@ -6840,27 +7494,28 @@
 + 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
 py312: commands[2] .pybuild/cpython3_3.12/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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/really-conflicted/.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:
@@ -6871,10 +7526,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-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
++ 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
@@ -6889,50 +7543,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_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
@@ -6952,19 +7616,21 @@
 + 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
@@ -6972,9 +7638,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
@@ -6982,9 +7650,11 @@
 + 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
@@ -6992,14 +7662,16 @@
 + text=4
 + 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
@@ -7007,19 +7679,21 @@
 + text=5
 + echo 5
 + git add c.txt
-+ 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
@@ -7027,14 +7701,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
@@ -7042,14 +7718,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
@@ -7057,9 +7735,11 @@
 + 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
@@ -7067,14 +7747,16 @@
 + text=9
 + echo 9
 + 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 --
@@ -7084,39 +7766,43 @@
 + 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
-[d 8c3c065] d⇒1
- 3 files changed, 3 insertions(+), 3 deletions(-)
++ GIT_AUTHOR_DATE='@1112912004 +0000'
++ GIT_COMMITTER_DATE='@1112912004 +0000'
++ git commit -m $'d\342\207\2221'
 + modify d.txt 2
 + filename=d.txt
 + text=2
 + echo 2
 + git add d.txt
-+ modify conflict1.txt d version
+[d 8c3c065] d⇒1
+ 3 files changed, 3 insertions(+), 3 deletions(-)
++ 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
@@ -7124,9 +7810,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
@@ -7134,9 +7822,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
@@ -7144,14 +7834,16 @@
 + 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
@@ -7159,14 +7851,16 @@
 + 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
++ 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
@@ -7174,14 +7868,16 @@
 + 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
@@ -7189,14 +7885,16 @@
 + text=8
 + echo 8
 + git add d.txt
-+ 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
@@ -7241,8 +7939,8 @@
 
 + conflict_count=0
 + true
-+ git-imerge continue --no-edit
 + tee autofill.out
++ git-imerge continue --no-edit
 Attempting automerge of 9-8...failure.
 Attempting automerge of 1-1...failure.
 Switched to branch 'imerge/c-d'
@@ -7292,26 +7990,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 86df3f0] imerge 'c-d': manual merge 1-1
+[imerge/c-d 7f82038] 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.
@@ -7403,26 +8109,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 049d1a6] imerge 'c-d': manual merge 1-6
++ git-imerge continue --no-edit
+[imerge/c-d 2282398] 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.
@@ -7439,12 +8153,12 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  790e2e6 imerge 'c-d': automatic merge 3-8
+  cbc35f8 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> 790e2e6
+ git branch <new-branch-name> cbc35f8
 
 Switched to branch 'imerge/c-d'
 Auto-merging conflict1.txt
@@ -7493,26 +8207,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
 + git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d f5c3e62] imerge 'c-d': manual merge 4-2
+[imerge/c-d 631378b] 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.
@@ -7522,7 +8244,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 13d13c3 imerge 'c-d': automatic merge 4-8
+Previous HEAD position was 524561b imerge 'c-d': automatic merge 4-8
 Switched to branch 'imerge/c-d'
 Auto-merging conflict6.txt
 CONFLICT (content): Merge conflict in conflict6.txt
@@ -7570,26 +8292,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 2a9b7d7] imerge 'c-d': manual merge 5-1
+[imerge/c-d 5cf992d] 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.
@@ -7624,7 +8354,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 d7b3f7d imerge 'c-d': automatic merge 7-1
+Previous HEAD position was a07b6e3 imerge 'c-d': automatic merge 7-1
 Switched to branch 'imerge/c-d'
 Auto-merging conflict3.txt
 CONFLICT (content): Merge conflict in conflict3.txt
@@ -7672,26 +8402,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
-+ git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d 088cf9d] imerge 'c-d': manual merge 5-5
++ git-imerge continue --no-edit
+[imerge/c-d eb51662] 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.
@@ -7754,31 +8492,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 continue --no-edit
 + tee autofill.out
-[imerge/c-d 7fe0261] imerge 'c-d': manual merge 6-7
+[imerge/c-d 3ccedab] 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 bb980cf imerge 'c-d': automatic merge 6-8
+Previous HEAD position was f7a8e72 imerge 'c-d': automatic merge 6-8
 Switched to branch 'imerge/c-d'
 Auto-merging conflict2.txt
 CONFLICT (content): Merge conflict in conflict2.txt
@@ -7826,26 +8572,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
-+ git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d e95bd28] imerge 'c-d': manual merge 7-2
++ git-imerge continue --no-edit
+[imerge/c-d bffb01e] 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.
@@ -7927,26 +8681,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
-+ git-imerge continue --no-edit
 + tee autofill.out
-[imerge/c-d 23bc02a] imerge 'c-d': manual merge 9-8
++ git-imerge continue --no-edit
+[imerge/c-d 7b957d6] imerge 'c-d': manual merge 9-8
 Merge has been recorded for merge 9-8.
 Merge is complete!
 + grep -q Traceback autofill.out
@@ -7973,20 +8735,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:      Sun Nov 17 02:18:02 2024 +0000
+# Date:      Sat Dec 20 08:47:10 2025 +0000
 #
 # On branch c-d-merge
 # Changes to be committed:
@@ -8000,63 +8763,64 @@
 #	modified:   conflict7.txt
 #	modified:   d.txt
 #
-[c-d-merge a954b43] Merge d into c (using imerge)
- Date: Sun Nov 17 02:18:02 2024 +0000
+[c-d-merge b26e43c] Merge d into c (using imerge)
+ Date: Sat Dec 20 08:47:10 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
 py312: commands[3] .pybuild/cpython3_3.12/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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/duplicated/.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:
@@ -8067,10 +8831,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -8080,86 +8843,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_AUTHOR_DATE='@1112911994 +0000'
++ GIT_COMMITTER_DATE='@1112911994 +0000'
++ git commit -m $'m\342\207\2220'
++ git checkout -b a --
 [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_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
-[b 62a5c56] a⇒1 on branch b
- 1 file changed, 1 insertion(+), 1 deletion(-)
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'a⇒1 on branch b'
++ 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
+[b 62a5c56] a⇒1 on branch b
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++ 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
@@ -8234,54 +9020,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:      Sun Nov 17 02:18:05 2024 +0000
+# Date:      Sat Dec 20 08:47:21 2025 +0000
 #
 # On branch a-b-merge
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-b-merge 384ef73] Merge b into a (using imerge)
- Date: Sun Nov 17 02:18:05 2024 +0000
+[a-b-merge 6af80d4] Merge b into a (using imerge)
+ Date: Sat Dec 20 08:47:21 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'
@@ -8334,27 +9121,29 @@
 + 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
 py312: commands[4] .pybuild/cpython3_3.12/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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-1/.git/
 + 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
 hint: Using 'master' as the name for the initial branch. This default branch name
@@ -8367,10 +9156,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -8380,72 +9168,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'
++ git checkout -b a --
 [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
-[b 044a3fa] b⇒1 and a⇒X on branch b
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 b.txt
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'b⇒1 and a⇒X on branch b'
++ 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
+[b 044a3fa] b⇒1 and a⇒X on branch b
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 b.txt
++ msg=$'b\342\207\2222'
 + test 2 = 1
 + test 2 = 2
 + modify a.txt 0
@@ -8453,36 +9256,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
++ 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
@@ -8554,12 +9365,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
-+ + tee imerge-b-into-a-1-2.out
-git-imerge continue --no-edit
-[imerge/b 8934ef0] imerge 'b': manual merge 1-1
++ tee imerge-b-into-a-1-2.out
++ git-imerge continue --no-edit
+[imerge/b ccbc423] 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.
@@ -8567,7 +9378,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 4b61133 imerge 'b': automatic merge 3-1
+Previous HEAD position was c1a6aae imerge 'b': automatic merge 3-1
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -8620,12 +9431,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 2e10cc0] imerge 'b': manual merge 1-2
++ git-imerge continue --no-edit
++ tee imerge-b-into-a-1-3.out
+[imerge/b f12a22f] imerge 'b': manual merge 1-2
 Merge has been recorded for merge 1-2.
 Attempting automerge of 1-4...success.
 Autofilling 1-3...success.
@@ -8640,7 +9451,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
        |  |
@@ -8670,20 +9481,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:      Sun Nov 17 02:18:08 2024 +0000
+# Date:      Sat Dec 20 08:47:33 2025 +0000
 #
 # On branch b-into-a-1
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-1 6156a5b] Merge b into a (using imerge)
- Date: Sun Nov 17 02:18:08 2024 +0000
+[b-into-a-1 52e4811] Merge b into a (using imerge)
+ Date: Sat Dec 20 08:47:33 2025 +0000
 + test_merge a-into-b-1 b a 1-1 2-1
 + local name=a-into-b-1
 + local dst=b
@@ -8692,8 +9504,8 @@
 + local conflict2=2-1
 + git checkout b
 Switched to branch 'b'
-+ git-imerge merge --branch=a-into-b-1 a
 + tee imerge-a-into-b-1-1.out
++ git-imerge merge --branch=a-into-b-1 a
 Attempting automerge of 4-3...success.
 Autofilling 1-3...unexpected conflict.  Backtracking...
 Autofilling 1-2...unexpected conflict.  Backtracking...
@@ -8748,12 +9560,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
-+ git-imerge continue --no-edit
 + tee imerge-a-into-b-1-2.out
-[imerge/a 45cca21] imerge 'a': manual merge 1-1
++ git-imerge continue --no-edit
+[imerge/a 1c3527d] imerge 'a': manual merge 1-1
 Merge has been recorded for merge 1-1.
 Attempting automerge of 1-3...success.
 Autofilling 1-2...success.
@@ -8811,12 +9623,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
-+ tee imerge-a-into-b-1-3.out
 + git-imerge continue --no-edit
-[imerge/a 7898aed] imerge 'a': manual merge 2-1
++ tee imerge-a-into-b-1-3.out
+[imerge/a 4da1348] imerge 'a': manual merge 2-1
 Merge has been recorded for merge 2-1.
 Attempting automerge of 2-3...success.
 Autofilling 2-2...success.
@@ -8831,7 +9643,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
        |   |
@@ -8859,30 +9671,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:      Sun Nov 17 02:18:09 2024 +0000
+# Date:      Sat Dec 20 08:47:38 2025 +0000
 #
 # On branch a-into-b-1
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-1 48f13bc] Merge a into b (using imerge)
- Date: Sun Nov 17 02:18:09 2024 +0000
+[a-into-b-1 6808baa] Merge a into b (using imerge)
+ Date: Sat Dec 20 08:47:38 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
@@ -8896,10 +9710,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 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'
 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
 + 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
@@ -8909,85 +9723,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
-[b 1f7d097] b⇒1 on branch b
- 1 file changed, 1 insertion(+)
- create mode 100644 b.txt
++ GIT_AUTHOR_DATE='@1112911998 +0000'
++ GIT_COMMITTER_DATE='@1112911998 +0000'
++ git commit -m 'b⇒1 on branch b'
++ 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
+[b 1f7d097] b⇒1 on branch b
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.txt
++ 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
-+ msg=b⇒3
++ msg=$'b\342\207\2223'
 + test 3 = 2
 + test 3 = 3
 + modify a.txt 0
@@ -8995,23 +9827,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
@@ -9022,8 +9859,8 @@
 + local conflict2=1-3
 + git checkout a
 Switched to branch 'a'
-+ git-imerge merge --branch=b-into-a-2 b
 + tee imerge-b-into-a-2-1.out
++ git-imerge merge --branch=b-into-a-2 b
 Attempting automerge of 3-4...success.
 Autofilling 1-4...success.
 Autofilling 2-4...success.
@@ -9097,12 +9934,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
-+ git-imerge continue --no-edit
 + tee imerge-b-into-a-2-2.out
-[imerge/b f265254] imerge 'b': manual merge 1-2
++ git-imerge continue --no-edit
+[imerge/b f32b22c] 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.
@@ -9110,7 +9947,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 a95c1a4 imerge 'b': automatic merge 3-2
+Previous HEAD position was a3297b6 imerge 'b': automatic merge 3-2
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -9163,12 +10000,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
 + git-imerge continue --no-edit
 + tee imerge-b-into-a-2-3.out
-[imerge/b 2af2f51] imerge 'b': manual merge 1-3
+[imerge/b 21609d8] imerge 'b': manual merge 1-3
 Merge has been recorded for merge 1-3.
 Attempting automerge of 1-4...success.
 Autofilling 1-4...success.
@@ -9181,7 +10018,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
        |  |
@@ -9211,20 +10048,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:      Sun Nov 17 02:18:11 2024 +0000
+# Date:      Sat Dec 20 08:47:45 2025 +0000
 #
 # On branch b-into-a-2
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-2 0ab7dfb] Merge b into a (using imerge)
- Date: Sun Nov 17 02:18:11 2024 +0000
+[b-into-a-2 12e308f] Merge b into a (using imerge)
+ Date: Sat Dec 20 08:47:45 2025 +0000
 + test_merge a-into-b-2 b a 2-1 3-1
 + local name=a-into-b-2
 + local dst=b
@@ -9294,12 +10132,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 c08cc18] imerge 'a': manual merge 2-1
++ git-imerge continue --no-edit
+[imerge/a 9592b6e] imerge 'a': manual merge 2-1
 Merge has been recorded for merge 2-1.
 Attempting automerge of 2-3...success.
 Autofilling 2-2...success.
@@ -9357,12 +10195,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
 + git-imerge continue --no-edit
 + tee imerge-a-into-b-2-3.out
-[imerge/a 82693d2] imerge 'a': manual merge 3-1
+[imerge/a d7cc515] imerge 'a': manual merge 3-1
 Merge has been recorded for merge 3-1.
 Attempting automerge of 3-3...success.
 Autofilling 3-2...success.
@@ -9374,7 +10212,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
        |   |
@@ -9402,32 +10240,35 @@
   @ = 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:      Sun Nov 17 02:18:11 2024 +0000
+# Date:      Sat Dec 20 08:47:50 2025 +0000
 #
 # On branch a-into-b-2
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-2 6a80129] Merge a into b (using imerge)
- Date: Sun Nov 17 02:18:11 2024 +0000
+[a-into-b-2 6d0091b] Merge a into b (using imerge)
+ Date: Sat Dec 20 08:47:50 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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3/.git/
 + git init /build/reproducible-path/git-imerge-1.2.0/t/tmp/flip-flop-3
 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
@@ -9439,10 +10280,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -9452,98 +10292,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
++ 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 = 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
@@ -9551,10 +10412,12 @@
 + 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
@@ -9565,8 +10428,8 @@
 + local conflict2=1-4
 + git checkout a
 Switched to branch 'a'
-+ + git-imerge merge --branch=b-into-a-3 b
-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.
@@ -9646,12 +10509,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 815d90c] imerge 'b': manual merge 1-3
+[imerge/b e90e7ae] 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.
@@ -9659,7 +10522,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 96d7712 imerge 'b': automatic merge 3-3
+Previous HEAD position was 80a8929 imerge 'b': automatic merge 3-3
 Switched to branch 'imerge/b'
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
@@ -9712,19 +10575,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 8dea500] imerge 'b': manual merge 1-4
++ git-imerge continue --no-edit
+[imerge/b 8014a30] 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
        |  |
@@ -9754,20 +10617,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:      Sun Nov 17 02:18:13 2024 +0000
+# Date:      Sat Dec 20 08:47:57 2025 +0000
 #
 # On branch b-into-a-3
 # Changes to be committed:
 #	new file:   b.txt
 #
-[b-into-a-3 c4401f7] Merge b into a (using imerge)
- Date: Sun Nov 17 02:18:13 2024 +0000
+[b-into-a-3 7430b55] Merge b into a (using imerge)
+ Date: Sat Dec 20 08:47:57 2025 +0000
 + test_merge a-into-b-3 b a 3-1 4-1
 + local name=a-into-b-3
 + local dst=b
@@ -9776,8 +10640,8 @@
 + local conflict2=4-1
 + git checkout b
 Switched to branch 'b'
-+ git-imerge merge --branch=a-into-b-3 a
 + tee imerge-a-into-b-3-1.out
++ git-imerge merge --branch=a-into-b-3 a
 Attempting automerge of 4-3...success.
 Autofilling 1-3...success.
 Autofilling 2-3...success.
@@ -9841,12 +10705,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
-+ + git-imergetee continue imerge-a-into-b-3-2.out --no-edit
-
-[imerge/a 5b47ae2] imerge 'a': manual merge 3-1
++ git-imerge continue --no-edit
++ tee imerge-a-into-b-3-2.out
+[imerge/a be6aca6] imerge 'a': manual merge 3-1
 Merge has been recorded for merge 3-1.
 Attempting automerge of 3-3...success.
 Autofilling 3-2...success.
@@ -9904,19 +10768,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 ff56503] imerge 'a': manual merge 4-1
++ tee imerge-a-into-b-3-3.out
+[imerge/a c878b27] 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
        |   |
@@ -9944,39 +10808,41 @@
   @ = 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:      Sun Nov 17 02:18:14 2024 +0000
+# Date:      Sat Dec 20 08:48:03 2025 +0000
 #
 # On branch a-into-b-3
 # Changes to be committed:
 #	modified:   a.txt
 #
-[a-into-b-3 d8e8178] Merge a into b (using imerge)
- Date: Sun Nov 17 02:18:14 2024 +0000
+[a-into-b-3 2f55f06] Merge a into b (using imerge)
+ Date: Sat Dec 20 08:48:03 2025 +0000
 py312: commands[5] .pybuild/cpython3_3.12/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
+Initialized empty Git repository in /build/reproducible-path/git-imerge-1.2.0/t/tmp/drop/.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:
@@ -9987,10 +10853,9 @@
 hint: 'development'. The just-created branch can be renamed via this command:
 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
@@ -10000,80 +10865,100 @@
 + 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
-[master 389a4ba] a1⇒1
- 1 file changed, 1 insertion(+)
- create mode 100644 a1.txt
++ GIT_AUTHOR_DATE='@1112911995 +0000'
++ GIT_COMMITTER_DATE='@1112911995 +0000'
++ git commit -m $'a1\342\207\2221'
++ for i in $(seq 6)
 + modify a2.txt 2
 + filename=a2.txt
 + text=2
 + echo 2
 + git add a2.txt
-+ commit -m a2⇒2
+[master 389a4ba] a1⇒1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1.txt
++ 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⇒3
++ commit -m $'a3\342\207\2223'
 + TIME=1112911997
-+ GIT_AUTHOR_DATE=@1112911997 +0000 GIT_COMMITTER_DATE=@1112911997 +0000 git commit -m a3⇒3
-[master 34bdde3] a3⇒3
- 1 file changed, 1 insertion(+)
- create mode 100644 a3.txt
++ GIT_AUTHOR_DATE='@1112911997 +0000'
++ GIT_COMMITTER_DATE='@1112911997 +0000'
++ git commit -m $'a3\342\207\2223'
++ for i in $(seq 6)
 + modify a4.txt 4
 + filename=a4.txt
 + text=4
 + echo 4
 + git add a4.txt
-+ commit -m a4⇒4
+[master 34bdde3] a3⇒3
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a3.txt
++ 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
-+ 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
-+ 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'
++ git checkout -b dropped master
 [master 9d6aec5] a6⇒6
  1 file changed, 1 insertion(+)
  create mode 100644 a6.txt
-+ git checkout -b dropped master
 Switched to a new branch 'dropped'
 + git-imerge drop HEAD~5..HEAD~3
 Note: switching to '34bdde3a6a5b6b9c8bcac5aa36109195e2a3dc7a^0'.
@@ -10094,12 +10979,12 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 34bdde3 a3⇒3
-[detached HEAD ad60eec] Revert "a3⇒3"
- Date: Sun Nov 17 02:18:14 2024 +0000
+[detached HEAD 8720578] Revert "a3⇒3"
+ Date: Sat Dec 20 08:48:04 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a3.txt
-[detached HEAD 27f48bd] Revert "a2⇒2"
- Date: Sun Nov 17 02:18:14 2024 +0000
+[detached HEAD 9fd976a] Revert "a2⇒2"
+ Date: Sat Dec 20 08:48:04 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a2.txt
 Attempting automerge of 3-2...success.
@@ -10109,7 +10994,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='27f48bdfe89941b8cc3f58a0cfc51d3dc954dc37', goal='drop')[0:4,0:3].
+Recording autofilled block MergeState('dropped', tip1='dropped', tip2='9fd976addaa7463282d8a840968bd41496177f2b', goal='drop')[0:4,0:3].
 Merge is complete!
 + git-imerge diagram --commits --frontier --html=imerge-drop.html
        0  3
@@ -10118,7 +11003,7 @@
        *??.
    2 - *...
        |
-     27f48bdfe89941b8cc3f58a0cfc51d3dc954dc37
+     9fd976addaa7463282d8a840968bd41496177f2b
 
        0  3
        |  |
@@ -10126,7 +11011,7 @@
        *??|
    2 - *--+
        |
-     27f48bdfe89941b8cc3f58a0cfc51d3dc954dc37
+     9fd976addaa7463282d8a840968bd41496177f2b
 
 Key:
   |,-,+ = rectangles forming current merge frontier
@@ -10140,7 +11025,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'
@@ -10163,12 +11048,12 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 34bdde3 a3⇒3
-[detached HEAD ad60eec] Revert "a3⇒3"
- Date: Sun Nov 17 02:18:14 2024 +0000
+[detached HEAD 5856af8] Revert "a3⇒3"
+ Date: Sat Dec 20 08:48:06 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a3.txt
-[detached HEAD f698d18] Revert "a2⇒2"
- Date: Sun Nov 17 02:18:15 2024 +0000
+[detached HEAD ad5c791] Revert "a2⇒2"
+ Date: Sat Dec 20 08:48:06 2025 +0000
  1 file changed, 1 deletion(-)
  delete mode 100644 a2.txt
 Attempting automerge of 3-2...success.
@@ -10178,7 +11063,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='f698d18cad24ed2292dee2b9f5c5fdec7789444b', goal='revert')[0:4,0:3].
+Recording autofilled block MergeState('reverted', tip1='reverted', tip2='ad5c7914741c62a1ab88b4c93340ee6a83121d01', goal='revert')[0:4,0:3].
 Merge is complete!
 + git-imerge diagram --commits --frontier --html=imerge-revert.html
        0  3
@@ -10187,7 +11072,7 @@
        *??.
    2 - *...
        |
-     f698d18cad24ed2292dee2b9f5c5fdec7789444b
+     ad5c7914741c62a1ab88b4c93340ee6a83121d01
 
        0  3
        |  |
@@ -10195,7 +11080,7 @@
        *??|
    2 - *--+
        |
-     f698d18cad24ed2292dee2b9f5c5fdec7789444b
+     ad5c7914741c62a1ab88b4c93340ee6a83121d01
 
 Key:
   |,-,+ = rectangles forming current merge frontier
@@ -10209,10 +11094,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
-  py312: OK (85.83=setup[1.49]+cmd[3.99,59.61,9.35,3.15,7.25,0.99] seconds)
-  congratulations :) (85.92 seconds)
+  py312: OK (310.70=setup[3.45]+cmd[15.48,209.49,30.38,11.58,34.71,5.61] seconds)
+  congratulations :) (311.00 seconds)
    create-stamp debian/debhelper-build-stamp
    dh_testroot -O--buildsystem=pybuild
    dh_prep -O--buildsystem=pybuild
@@ -10282,12 +11167,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/1456233/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/1456233/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/4109875 and its subdirectories
-I: Current time: Sat Nov 16 14:18:18 -12 2024
-I: pbuilder-time-stamp: 1731809898
+I: removing directory /srv/workspace/pbuilder/1456233 and its subdirectories
+I: Current time: Sat Dec 20 22:48:16 +14 2025
+I: pbuilder-time-stamp: 1766220496