log mercurial/filemerge.py @ 6211:f89fd07fc51d

age author description
Thu, 06 Mar 2008 22:23:26 +0100 Joel Rosdahl Expand import * to allow Pyflakes to find problems
Wed, 06 Feb 2008 20:44:25 -0600 Steve Borho filemerge: more backwards compatible behavior for ui.merge
Wed, 06 Feb 2008 20:32:06 -0600 Steve Borho filemerge: add 'checkchanged' merge tool property