Print conflict details with the new infrastructure (bug #11181)
[stgit] / COPYING
2005-07-10 Catalin MarinasInitial commit (Release 0.4) v0.4