Will Szumski 786a78d074 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
2023-11-17 18:56:23 +00:00
..