Print conflict details with the new infrastructure (bug #11181)
[stgit] / perf / .gitignore
CommitLineData
5200ae3c
KH
1/*.orig
2/*.trash