Note:
Diff – instrument which allow to compare the content of 2 files and detect their differences
Merge – instrument that enable you unite 2 similar files in 1, considering the differences of each file.
Read the full article with the recommendation of IT specialists following the link (ru).