apply: register conflicted stages to the index

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3addb804d56fe2f0bcbf2d78bddd541880098c8d..cd042633ba5ec36be89507d25254b32a8f0b98ae 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -443,7 +443,7 @@ test_expect_success 'stash show format defaults to --stat' '
        STASH_ID=$(git stash create) &&
        git reset --hard &&
        cat >expected <<-EOF &&
-        file |    1 +
+        file | 1 +
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&