log mercurial/filemerge.py @ 8592:cc22b4168879

age author description
Sun, 24 May 2009 02:56:14 -0500 Matt Mackall match: add some default args
Sun, 24 May 2009 02:56:14 -0500 Matt Mackall match: change all users of util.matcher to match.match
Tue, 28 Apr 2009 17:40:46 +0200 Simon Heimberg separate import lines from mercurial and general python modules
Thu, 30 Apr 2009 23:57:36 -0500 Steve Borho simplemerge: use ui.warn() for warnings
Thu, 30 Apr 2009 10:15:32 -0500 Steve Borho ui: replace regexp pattern with sequence of choices
Sun, 26 Apr 2009 01:08:54 +0200 Martin Geisler updated license to be explicit about GPL version 2
Sun, 26 Apr 2009 16:50:44 -0500 Matt Mackall replace util.sort with sorted built-in
Mon, 23 Mar 2009 13:12:07 +0100 Peter Arrenbrecht cleanup: drop unused imports
Fri, 07 Nov 2008 02:47:12 +0100 Mads Kiilerich More verbose logging when filemerge searches for merge-tool
Fri, 27 Jun 2008 18:28:45 -0500 Matt Mackall util: add sort helper
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