On 2021-02-24 at 10:05:12, Kerry, Richard wrote:
> 
> It's now been quite a few weeks, probably months, since the
> "ort-merge" work has been going one.  However, I don't think I've ever
> seen an explanation of what "ort" means.  I know it means "place" in
> German, but that seems an unlikely usage because git project generally
> works in English.  I don't know of it as a word in English.  So maybe
> it's an acronym - ORT.  But what does that mean?
> 
> So, can someone please say what "ort" means?

I believe it's a joke.  One can use the -s option to control the
strategy, so you could write "git merge -sort" to use the new
implementation.
-- 
brian m. carlson (he/him or they/them)
Houston, Texas, US