Fix a merge case with files added in both heads but different
[stgit] / t / .gitignore
1 trash