Code

notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd