Print conflict details with the new infrastructure (bug #11181)
[stgit] / stgit / .gitignore
1 *.pyc