Print conflict details with the new infrastructure (bug #11181)
[stgit.git] / AUTHORS
blob66178065727525bf98909f57c03f32a17bf09859
1 Catalin Marinas <catalin.marinas@gmail.com>
2         http://www.procode.org/about.html
3 Karl Hasselström <kha@treskal.com>
4         http://www.treskal.com/kalle/