so for the time being I use sourcetree with P4Merg...
# random
o
so for the time being I use sourcetree with P4Merge