Skip to content
Snippets Groups Projects
  • Will Szumski's avatar
    786a78d0
    Deduplicate before picking merge strategy · 786a78d0
    Will Szumski authored
    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
    786a78d0
    History
    Deduplicate before picking merge strategy
    Will Szumski authored
    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