am 843b12a8: am 6b26de17: am 5360af4a: Remove support for duplicate file entries.

* commit '843b12a808a7d1a03efdad1e9057f0d6fa0d3a52':
  Remove support for duplicate file entries.