log mercurial/filemerge.py @ 9709:5858117a0077

age author description
Wed, 04 Nov 2009 15:18:19 +0100 Sune Foldager merge: supply base node to merge tools in the environment
Sat, 19 Sep 2009 01:15:38 +0200 Martin Geisler do not attempt to translate ui.debug output
Tue, 07 Jul 2009 17:26:20 +0200 Martin Geisler filemerge, subrepo: correct indention
Sun, 21 Jun 2009 01:13:19 +0200 Simon Heimberg ui: extract choice from prompt
Sat, 20 Jun 2009 16:42:51 -0500 Matt Mackall filemerge: fix internal:dump
Thu, 18 Jun 2009 16:56:03 -0500 Matt Mackall filemerge: add internal:dump
Thu, 18 Jun 2009 16:56:02 -0500 Matt Mackall filemerge: add internal:prompt target
Sun, 24 May 2009 22:37:20 +0200 Martin Geisler use ui instead of repo.ui when the former is in scope
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