Web lists-archives.com

Re: [PATCH] log,diff-tree: add --combined-with-paths options for merges with renames




Elijah Newren <newren@xxxxxxxxx> writes:

> ... Instead, I decided that
> instead of having a "from" and a "to" header, we would have N "from"
> headers (since all parents are what we came from) and 1 "to" header.
> I hope that makes sense, because otherwise I think this become to
> unwieldy of a change.

Yeah, it makes sense for an N-way merge to have N 'from' pathnames
that resulted in a single 'to' pathname in the resulting tree.