In my opinion, mercural/dvcs doesn't reduce the pain of merges, it just makes merging something you do SO OFTEN it becomes second nature