Fix diff output, now keeps 'added' in 'added' if replaced in later diffs