Improved diff view of merge conflicts

[isc-pbarton]

If there is an unmerged change, the workspace view just shows:
Unmerged path cls/pbarton/addtosync.cls

Git diff gives a better output with merge conflict markers. We should show something similar.