show all unresolved files and some additional errors
commitfe7baaf8da2cab168602e51217e1587492fcdc3e
authorMarc Weber <marco-oweber@gmx.de>
Tue, 29 Jul 2008 12:16:07 +0000 (29 14:16 +0200)
committerMarc Weber <marco-oweber@gmx.de>
Tue, 29 Jul 2008 12:16:07 +0000 (29 14:16 +0200)
treee767fafd47fc7a9501eacdcc409a2a8373cfc841
parentb4ced7e7662b0fca3a848e76f4ae1ad2150547ca
show all unresolved files and some additional errors
git-test-merge