WinMerge - Merge program for Windows. Should I integrate it into Mercurial so that something sensible can happen when conflicts arise during merges.