542
542
test_expect_success 'resolve situation by aborting the notes merge' '
543
543
git notes merge --abort &&
544
544
# No .git/NOTES_MERGE_* files left
546
546
test_cmp /dev/null output &&
547
547
# m has not moved (still == w)
548
548
test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&