Print conflict details with the new infrastructure (bug #11181)
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 3564 gitconfig
-rw-r--r-- 55 patchdescr.tmpl