file comparison

diff and merge files on computers