commit c52bf7fe573b3f64277c940f6cb99a39a07e8683
from: Stefan Sperling <stsp@stsp.name>
date: Sun Oct 03 21:26:12 2021 UTC

sync dist file list

commit - 62da3196627c41ea9acc5f53e0da9887dca2b82d
commit + c52bf7fe573b3f64277c940f6cb99a39a07e8683
blob - 3143a047dcd9e6ec45d5725be8d27f41a586ea27
blob + ac8dd0a76d8d34410f8eb4fdc2c4ef9778d92072
--- got-dist.txt
+++ got-dist.txt
@@ -232,6 +232,7 @@
 /regress/cmdline/import.sh
 /regress/cmdline/integrate.sh
 /regress/cmdline/log.sh
+/regress/cmdline/merge.sh
 /regress/cmdline/pack.sh
 /regress/cmdline/rebase.sh
 /regress/cmdline/ref.sh