Make format clearer with multiple merge conflicts

Really small.  Previously the output for merge conflicts mashed together:

``` sh
    2014-11-17 [Sravan Reddy] 9c3f8be  
    pep8 
    
    This commit also appears on these branches:
    * hq-dropdown
    * /4741
  [.] edit-build-messages => autostaging
  * First conflicting commit on autostaging:
```

The line `  [.] edit-build-messages => autostaging` indicates another merge conflict.