Diffmerge will allow you to compare two files or folders and merge them easily. It is a must have tool for any developer. You can keep track of source code changes ...