1 patch for repository http://darcs.net/screened:
Tue Mar 27 16:31:19 MDT 2012 Michael Hendricks <michael@ndrix.org>
* List conflicted files one per line
Makes it easier to see how many conflicts are present; especially
when dealing with long filenames.