git diff3 and elisp func

Created by  hdhoang  on January 26, 2023
E2E3YYJ5O2BEK3PRQKP7Q4SRLP6YFFQGEW2MB32ODJKWICSPLUVQC
Change contents