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

* commit 'ab822d88df19200ac967e4f604937cff058da034':