D778: merge: backup conflicting directories when getting files

[ryanmce (Ryan McElroy)]

ryanmce requested changes to this revision.
ryanmce added a comment.
This revision now requires changes to proceed.


  It seems like this one should have an externally-testable result. Could you adda test that shows the new behavior working better than it did before? If there a bug on bugzilla open that this solves?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D778

To: mbthomas, #hg-reviewers, ryanmce
Cc: ryanmce, mercurial-devel