Fix for issue #136 - Conflict Merge Tool window too tall

Modify the window to allow scrolling of the merge conflict entries
within the window and further constrain the max size of the window to
what Tk reports as the screen maximum size.