t2800: Adapt to changes in git's conflict markers
[stgit] / t / .gitignore
1 trash