rerere: mention caveat about unmatched conflict markers

diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 2211f9831fb07f933c8c3f0c7cfd89cc5512c253..4623ae15c4fd45df64b4acb94308e5ac4ca8f1f5 100755 (executable)
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -50,13 +50,13 @@ test_expect_success 'create_symref(FOO, refs/heads/master)' '
 '
 
 test_expect_success 'for_each_reflog()' '
-       echo $_z40 > .git/logs/PSEUDO-MAIN &&
+       echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
        mkdir -p     .git/logs/refs/bisect &&
-       echo $_z40 > .git/logs/refs/bisect/random &&
+       echo $ZERO_OID > .git/logs/refs/bisect/random &&
 
-       echo $_z40 > .git/worktrees/wt/logs/PSEUDO-WT &&
+       echo $ZERO_OID > .git/worktrees/wt/logs/PSEUDO-WT &&
        mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
-       echo $_z40 > .git/worktrees/wt/logs/refs/bisect/wt-random &&
+       echo $ZERO_OID > .git/worktrees/wt/logs/refs/bisect/wt-random &&
 
        $RWT for-each-reflog | cut -c 42- | sort >actual &&
        cat >expected <<-\EOF &&