Re: [Monotone-devel] Commit a child of 2 parents

[Daniel Carosone]

On Sun, Jan 15, 2006 at 09:02:04PM -0600, Timothy Brownawell wrote:
> Note that if monotone can merge a file without conflicts, then it
> doesn't call the merge hook on that file at all.

Yes, you'll need to set manual_merge to true. A switch to merge to
imply this for all files in this commit is probably better than
forcing files to have inappropriate attributes.

--
Dan.

pgpHnsA7FAIzC.pgp
Description: PGP signature