Fix a merge case with files added in both heads but different
[stgit] / setup.cfg
1 [install]
2 prefix: /usr