Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Deduplicate before picking merge strategy
I missed this when I refactored the code to fallback to templating. We need to deduplicate before picking the strategy for the fallback to work for symlinked files. Change-Id: Iddd6c90a6daa41e1d1cdaa6b598491792c13394d Closes-Bug: #2042689 (cherry picked from commit 786a78d)
- Loading branch information