diff --git a/test-merge.sh b/test-merge.sh new file mode 100755 index 0000000..9d31653 --- /dev/null +++ b/test-merge.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +set -euo pipefail + +set -x + +# The tomono script is tangled right next to the test script +export PATH="$PWD:$PATH" + +d="$(mktemp -d)" +cd "$d" + +# Two reasonably complex repos with lots of changes but not too many. And both +# with a ‘master’ branch. +>remotes.txt cat <> locals.txt +done + +