We keep the different stages of a conflict in the index now
[stgit] / t / .gitignore
2006-05-08 Pavel RoskinAdd .gitignore files, list generated files there