chiark / gitweb /
Fix a merge case with files added in both heads but different
[stgit] / .gitignore
1 build
2 dist
3 MANIFEST
4 patches-*