merge_recursive: Fix renames across paths below D/F conflicts

diff --git a/t/t3304-notes-mixed.sh b/t/t3304-notes-mixed.sh
index c975a6d3f72ad8595c7f85dbfe88ba4e23a75759..1709e8c00b859ae4f8ce91c7920a9411ac4acbce 100755 (executable)
--- a/t/t3304-notes-mixed.sh
+++ b/t/t3304-notes-mixed.sh
@@ -188,7 +188,7 @@ test_expect_success "verify contents of non-notes" '
 test_expect_success "git-notes preserves non-notes" '
 
        test_tick &&
-       git notes edit -m "foo bar"
+       git notes add -f -m "foo bar"
 '
 
 test_expect_success "verify contents of non-notes after git-notes" '