When it comes to manual merge of text files, Beyond compare is best tool I ever liked. This tools really helps to see differences with colors and I can easily push code from one file to other. other best thing is it compares folders. Review collected by and hosted on G2.com.
Really i don't have any dislike about beyond compare. once I face out of memory issue while opening big text files. Review collected by and hosted on G2.com.



