How well do various revision tools handle merge conflicts?plus.google.com94 pointsdecklin14 years ago