views:

17

answers:

0

Hello, I am attempting to merge a large quantity of files. Several of these files are in conflict and TortoiseMerge is the tool of choice.

When I view the code in the "merged" windows it shows me all the code that was deleted and added as well as ??? for code that is in-conflict. I am not really sure why it shows me the deleted code, but I do know that I don't want to see it. Seeing lines of code that were removed in a window that is "the results" doesn't make any sense; and, it makes it harder to read the.

Is there a way to hide the deleted code in that "results" window so only the text that is actually going to be in the file, shows up?

I have read the manual (cursively) and I didn't see anything in there that indicated how to accomplish this (seemingly insignificant) task.