Subject: bug#70503: [PATCH] Add function "TeX-master-output-file"

From: Arash Esbati <[email-masked]>
Date: Tue, 14 May 2024 14:53:17 +0200

Ikumi Keita <[email-masked]> writes:

> Now bug#70811 is resolved. I think we can go now.

Thanks, I updated NEWS.org and pushed.  Then I did:

• $ git switch main
• $ git merge origin/master and get the following:

CONFLICT (modify/delete): Makefile.in deleted in HEAD and modified in
origin/master.  Version origin/master of Makefile.in left in tree.
Automatic merge failed; fix conflicts and then commit the result.

@Tassilo: Please help ;-)

Best, Arash