Fix "stg resolved" to work with new conflict representation
[stgit] / stgit / .gitignore
2006-05-08 Pavel RoskinAdd .gitignore files, list generated files there