Fix the patch name stripping in import
[stgit] / stgit / gitmergeonefile.py
2006-03-10 Catalin MarinasDeal with merge conflicts directly