MergeMagician Screencasts - Demo 8
This screencast demonstrates how to easily resolve merge conflicts using MergeMagician's integrated merge viewer and e-mail notifications.