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