Print conflict details with the new infrastructure (bug #11181)
[stgit] / debian / compat
1 4