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