Re: git versus CVS (versus bk)

On Monday 07 November 2005 23:56, Petr Baudis wrote:

Dear diary, on Tue, Nov 01, 2005 at 10:15:33AM CET, I got a letter
where Petr Baudis [off-list ref] told me that...

quoted

That said, with a big warning, I would be willing to do something like
cg-merge -s and cg-update -s (s as squash)

...
FWIW, cg-merge -s and cg-update -s is supported now.

The -s option of git merge is about choosing a strategy.
How can I choose the "recursive" strategy with cg-merge?
Some consistency would be good here.

Josef