I rarely use the merge tool when I work with source control software. Rather I tend to use diff tools more often to identify the location of problems, then I go and manually fix each one. It's time...