keepass-diff: print which is newer when we have a conflict
keepass-diff: make the output easier to reason about