Fix a merge case with files added in both heads but different
[stgit] / debian / dirs
1 usr/bin