Print conflict details with the new infrastructure (bug #11181)
[stgit] / debian / .gitignore
... / ...
CommitLineData
1stgit
2files
3stgit.substvars
4stgit.*.debhelper