Philip Martin <philip.mar...@wandisco.com> writes: > The merge creates an added directory wc/D (copied from /T/D in the > repo). This conflicts with the directory D added by the update (which > is /X/B in the repo) so a tree conflict is created. Note that wc/D is
Typo: /X/B should be /B/D. > marked as replaced. -- Philip
