Patch Set 3:

I also found that when trying to use the merge tool on the result of rebase origin/master on the same scenario I cannot use the merge tool since the menu entry is grayed out. What's the difference compared to merge ?