[darcs-users] How is merge supposed to work?

[Jan Braun]

Miguel Bazdresch schrob:
> However, from what you say it looks like I'm grossly misunderstanding
> what 'darcs resolve' is supposed to do. From the manual:
> [...]
> Am I right?

You're right, I was wrong. Sorry.
See Tommy Pettersson's explanation, he gets it correctly (besides
thinking you meant what you asked whether I meant it..)
	Jan