1. grimmdp
  2. WinMerge

Branches

Creating, working with, and merging branches is easy with Mercurial.