Print conflict details with the new infrastructure (bug #11181)
[stgit.git] / Documentation / 
tree20e24b9214b3f904e7e55e07f7db1bd4617a5c7a
drwxr-xr-x   ..
-rw-r--r-- 56 .gitignore
-rw-r--r-- 2063 Makefile
-rw-r--r-- 2601 asciidoc.conf
-rwxr-xr-x 1049 build-docdep.perl
-rw-r--r-- 1057 callouts.xsl
-rw-r--r-- 5707 stg.txt
-rw-r--r-- 46 tutorial.conf
-rw-r--r-- 29802 tutorial.txt