SourceTree Always Shows Two-Way merge with Filemerge.

[August Junkala]

I have recently setup a new co-worker w/ SourceTree. When he tries to resolve conflicts it uses Filemerge and always shows a two-way view. We have been unable to find a difference between my setup (I get three-way merges) and his without any luck. Is there any known cause for this? 

[windwagon]

I've had that happen.  If you look at the  horizontal line  that is the bottom border of the right and left panes,  in the center you should see  a very small, half-shaded, circle.  Drag up on that  and the third pane will appear.