Re: Effective difference between git-rebase and git-resolve

Hi,

On Sat, 25 Mar 2006, Mark Wooding wrote:

Johannes Schindelin [off-list ref] wrote:

quoted

I am nowhere near kernel people, but I am using git on a machine where it 
is too cumbersome to install python. If git-resolve goes, I am without a 
merge strategy (at least until git-recursive is ported to C... was that 
not the plan with git-merge-tree? What happened on that front?).

Err... git-resolve isn't the same as git-merge-resolve.

Oooops.

Thank you,
Dscho