Show diff on conflict

[fwcd]

Either present it directly (perhaps just for small diffs?) or give the user an option to review the diff, perhaps even in a pager such as less, before having to choose between backup/overwrite/skip.