I notice that in the Windows version when I right-click a branch and hover over 'Track remote branch' the None option is always checked. When I change the remote branch to track then look again, None is still checked. In the Mac version the branches are checked as you would expect them to be. Is this correct or is this a bug in the Windows version?