We keep the different stages of a conflict in the index now
[stgit] / t / .gitignore
... / ...
CommitLineData
1trash