A merge tool that understands your source code... join betahttp://plasticscm.com/sm/index.html by psantosl • 13 years ago 1 1 13 years agoPLplasticscm.com