git: try zdiff3 & more parallel checkout

Created by  hdhoang  on November 20, 2023
XC6TOZ6EPFOSGQJ3MD3GRHDZCERCGZJRQK3CNAZUKIV726HCUBCAC
Change contents