[darcs-users] An example of a "complicated" change?

[Guillaume Hoffmann]

> Well, in fact there is no such thing as a "merge patch" in any of
> these systems.  There is a merge revision, usually different from all
> of its parents, and it has more than one parent.  So that revision
> must be recorded.
>
> This is also an event in history.  The merged in branch is now
> superseded by the mainline, and the merge revision records this fact.

OK, sorry for calling this a patch, but well:

* you have to run a certain operation by hand (choosing the head /
accepting the merge) which creates this entity
* it appears in the history

guillaume