Log conflicts separately
[stgit] / perf / .gitignore
1 /*.orig
2 /*.trash