log mercurial/filemerge.py @ 6744:d3691d31fc9c

age author description
Thu, 26 Jun 2008 13:52:16 -0500 Matt Mackall context: remove islink and isexec methods
Thu, 26 Jun 2008 13:46:34 -0500 Matt Mackall simplify flag handling
Sun, 13 Apr 2008 11:31:45 -0500 Matt Mackall Merge with -stable
Fri, 04 Apr 2008 02:21:53 +0300 Dov Feldstern use internal merge tool when specified for a merge-pattern in hgrc
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Thu, 06 Mar 2008 22:23:41 +0100 Joel Rosdahl Remove unused imports
Thu, 06 Mar 2008 22:23:26 +0100 Joel Rosdahl Expand import * to allow Pyflakes to find problems