Update to 4.2. Changes:

     * Mercurial support
     * Works with Subversion 1.7
     * Update BitKeeper support
     * Rudimentary Git support
Updated devel/tkdiff to 4.2