Mergiraf: A syntax-aware git merge driver for a growing collection of programming languages and file formats

When the structured merge times out, the warning now includes the path of the file that fell back to Git (from `-p`, or the base path otherwise): WARN structured merge of src/app/models.py took too lo...