Hi Johannes,

Le 22/03/2021 à 22:36, Johannes Schindelin a écrit :

Hi Alban,

On Wed, 17 Mar 2021, Alban Gruin wrote:

quoted

Until now, t6060 did not not check git-mere-one-file's behaviour when a

Channeling my inner Eric Sunshine: s/mere-one/merge-one/ ;-)

Good catch.

quoted

file is deleted in a branch.  To avoid regressions on this during the
conversion, this adds a new file, `file3', in the commit tagged as`base', and

Maybe "during the conversion from shell script to C"?

I'll rewrite it as "during the conversion from shell to C".

Cheers,
Alban

Other than that, looks good to me! Thanks,
Dscho