Merge branch 'da/mergetool-xxdiff-hotkey'

diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 3012a4d7c0aa5015add8ae3de2951981e28ee12a..e319fa2e8470791340a479989a81d934b79405da 100755 (executable)
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -246,8 +246,8 @@ test_expect_success 'verify --intent-to-add output' '
        git add --intent-to-add intent1.add intent2.add &&
 
        cat >expect <<-EOF &&
-       1 AM N... 000000 100644 100644 $_z40 $EMPTY_BLOB intent1.add
-       1 AM N... 000000 100644 100644 $_z40 $EMPTY_BLOB intent2.add
+       1 .A N... 000000 000000 100644 $_z40 $_z40 intent1.add
+       1 .A N... 000000 000000 100644 $_z40 $_z40 intent2.add
        EOF
 
        git status --porcelain=v2 >actual &&