Fix a merge case with files added in both heads but different
[stgit] / stgit / __init__.py
2005-07-10 Catalin MarinasInitial commit (Release 0.4) v0.4