show all unresolved files and some additional errors
treee767fafd47fc7a9501eacdcc409a2a8373cfc841
-rw-r--r-- 769 README
-rwxr-xr-x 4663 git-test-merge