I noticed this on the TFS Version Control Site, and thought this might be interesting for those using Team Foundation Server.  For our group sometimes there are some issues with the Resolution of conflicts when checking in.  The proposed interface looks good to me.  Love to hear other feedback!