merge-recursive: Fix sorting order and directory change assumptions

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 6aefe27593e89d57f075bc0d3dbc5a1104d874b7..6ccf7970916b58748aedcce7e583eed2dee782d3 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -47,6 +47,8 @@ for line in $FAKE_LINES; do
        case $line in
        squash|fixup|edit|reword)
                action="$line";;
+       exec*)
+               echo "$line" | sed 's/_/ /g' >> "$1";;
        "#")
                echo '# comment' >> "$1";;
        ">")