commit - 6092c29954d72000fdc1b6fe2a9c10ff56aabc65
commit + 8f7987b35cf5b218a730c88ed2a06979b6384bbd
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