On Mon, Jun 16, 2008 at 12:16:12PM +0200, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > I don't think that's what Geoff needs. The 'theirs' strategy replaces the > entire tree by 'their' - B's - tree. But IIUC, only the subset of files > that are contained in B should be replaced by B's version, the rest of the > files should remain unchanged. This is quite different from 'theirs' strategy. Thanks, I missed that difference, and sorry for the wrong suggestion.
Attachment:
pgp8RDuzOlFsH.pgp
Description: PGP signature
