log mercurial/filemerge.py @ 10263:25e572394f5c stable

age author description
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
Wed, 04 Nov 2009 15:18:19 +0100 Sune Foldager merge: supply base node to merge tools in the environment