Re: [Gnu-arch-users] graphical merges

[Matthew Dempsky]

Juliusz Chroboczek <address@hidden> writes:

> Is there a detailed description of what star-merge does somewhere?  I
> sometimes find its behaviour confusing, and would like to know whether
> it's my brain that's buggy.

star-merge takes your revision and builds the "other" revision that
you want to merge.  It then looks through the patch logs to find the
most recent revision shared by both in either's history and calls this
"ancestor."  If star-merge was called without -t (--three-way) then a
changeset is computed from "ancestor" to "other," and then applied to
"mine."  Otherwise, just a tree-delta (renames, deletes, etc.) is
applied to "mine" based on "ancestor" and "other," and then diff3 -m
is used to merge the contents of files.

-jivera