test/unit/merge: Refactor #putFolder() id conflict tests
test/unit/merge: Refactor #putFolder() id conflict tests

cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop