t2800: Adapt to changes in git's conflict markers
[stgit] / t / .gitignore
2006-05-08 Pavel RoskinAdd .gitignore files, list generated files there