debian / compaton commit ls-files: --others should not say unmerged paths are unknown. (fcbc308)
   14