Pavel Aslanov b5670e3bdc correctly handle conflicts in memory manifest ... Summary: Correctly resolve file/directory conflict in `MemoryManifest` - when we have file/directory conflict and have entry in `BonsaiChangeset` that indicates that file should be deleted we need resolve conflict by keeping directory - more details in [Bonsai changeset actions](https://fb.quip.com/A2kqArd9Nb90#WHBACA4Vitd) Reviewed By: lukaspiatkowski Differential Revision: D8658958 fbshipit-source-id: 815a91b847c5c0c9586eb5d317ebb9412196d5f4		2018-07-02 05:21:36 -07:00
..
main.rs	Bonsai::ChangeFile saving unittest	2018-06-22 05:21:14 -07:00
memory_manifest.rs	correctly handle conflicts in memory manifest	2018-07-02 05:21:36 -07:00
utils.rs	blobrepo: add scuba logging for changeset creation	2018-06-21 15:51:59 -07:00