A merge tool that understands your source code... join beta(plasticscm.com)1 points by psantosl 13 years ago | 1 comment