Hi Holger, all,
just to add that I effectively integrated this into the
GitFileTree-MergeDriver, including adding the "mcmerge" merge tool inside
the git configuration (where it is only used if you run the command `git
merge-tool --tool=mcmerge`).
With this, you still keep the ability to interact
Good Morning,
Thierry Goubier has merged a change to use the Pharo "merge" as a tool for "git
mergetool" and in this mail I explain how to configure it, give a small example
and explain my usecases for it. I am not sure the merge is fully working and
would like people to test and review (code a
