rebase: support -X to pass through strategy options

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 29438c59b98a9265760738af0d95a59c70cd5edf..828e35baf72d94908ad1f30dbd2e1aa6f9376e69 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -78,7 +78,7 @@ test_expect_success expanded_in_repo '
                echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
                echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
                echo "\$Id: NoTerminatingSymbol"
-               echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
+               echo "\$Id: Foreign Commit With Spaces \$"
                echo "\$Id: NoTerminatingSymbolAtEOF"
        } > expected-output &&