combined diff

The diff Git shows during a conflict, with one column of + and - for each side. Jo reads it with `git diff` before editing.