Round the file title; Add top border to conflict diffs

The file title sometimes overflows its container, which has the same 
border-radius. By always rounding the file title, the overflow never 
happens, so the corners always look correct.

Everywhere else there are file diffs, there is a top border to complete 
the full border around the file.