It just sounds like, more or less: $ diff3 -m my-file pick-file-parent pick-file

		kazinator on Feb 20, 2022 \| parent \| context \| favorite \| on: Jujutsu – A Git-compatible DVCS that is both simpl... It just sounds like, more or less: `$ diff3 -m my-file pick-file-parent pick-file`