mercurial/filemerge.py
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
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
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
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
Mon, 04 Feb 2008 19:38:34 -0600 Steve Borho filemerge: wrap quotes around tool path
Mon, 04 Feb 2008 09:56:01 -0600 dhruva filemerge: fix pattern matching
Sun, 03 Feb 2008 23:58:02 -0800 Lee Cantey filemerge: fix path to working file when fixeol is enabled
Mon, 04 Feb 2008 09:51:56 -0600 Matt Mackall filemerge: handle missing regappend
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: add config item for GUI tools
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add registry look up bits to tool search
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add support for tool EOL fixups
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: pull file-merging code into its own module
less more (0) tip