History t/t3309-notes-merge-auto-resolve.sh