Mercurial > hg-stable

log mercurial/filemerge.py @ 21824:57c70d3ad1c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -60 tip
age author description
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Thu, 08 May 2014 16:54:23 -0700 Durham Goode merge: add labels parameter from merge.update to filemerge
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Thu, 08 May 2014 16:37:33 -0700 Durham Goode merge: define conflict marker labels in filemerge()
Thu, 17 Apr 2014 14:54:46 +0200 Mads Kiilerich filemerge: better handling of failing remove of temporary files
Wed, 12 Mar 2014 13:15:09 -0400 Augie Fackler filemerge: move from dict() construction to {} literals
Wed, 22 May 2013 17:31:43 -0500 Matt Mackall ui: merge prompt text components into a singe string
Tue, 15 Jan 2013 01:05:11 +0100 Mads Kiilerich merge: warn when internal:merge cannot merge symlinks
Tue, 08 Jan 2013 04:15:46 +0100 Mads Kiilerich merge: never do premerge on symlinks
Tue, 08 Jan 2013 04:15:41 +0100 Mads Kiilerich merge: make internal merge fail cleanly on symlinks
Fri, 26 Oct 2012 12:02:58 -0700 Keegan Carruthers-Smith filemerge: use util.shellquote when calling merge (issue3581) stable
Tue, 13 Mar 2012 16:29:13 -0500 Matt Mackall merge with stable
Tue, 13 Mar 2012 15:12:26 -0500 Matt Mackall filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 stable
Thu, 01 Mar 2012 17:45:13 +0100 Thomas Arendsen Hein merge with stable
Thu, 01 Mar 2012 17:35:12 +0100 Thomas Arendsen Hein filemerge: remove temporary files when using internal:dump as merge-tool stable
Thu, 16 Feb 2012 15:58:51 -0600 Matt Mackall filemerge: remove some redundancy in decorators/docstrings
Sun, 12 Feb 2012 21:38:12 +0900 FUJIWARA Katsunori filemerge: create detail of internal merge tools from documentation string
Sun, 12 Feb 2012 21:38:12 +0900 FUJIWARA Katsunori filemerge: refactoring of 'filemerge()'
Wed, 21 Dec 2011 18:20:15 +0100 Laurens Holst context: add isbinary function
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)
Wed, 12 Oct 2011 21:45:58 -0400 Greg Ward merge: expand environment variables and ~/ in tool.executable
Fri, 24 Jun 2011 17:04:37 +0300 Idan Kamara filemerge: use ui out descriptor when calling util.system stable
Sun, 08 May 2011 20:35:46 +0200 Adrian Buehlmann rename util.find_exe to findexe
Fri, 06 May 2011 15:16:22 +0200 Adrian Buehlmann rename util.lookup_reg to lookupreg
Mon, 02 May 2011 10:11:18 +0200 Dan Villiom Podlaski Christiansen prevent transient leaks of file handle by using new helper functions
Tue, 08 Mar 2011 13:05:18 -0600 Steve Borho filemerge: introduce a 'regkeyalt' merge tool variable stable
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
Thu, 26 Aug 2010 17:55:07 +0200 Thomas Arendsen Hein merge with stable
Thu, 26 Aug 2010 17:38:43 +0200 Thomas Arendsen Hein Fix merge-tools.checkconflicts stable
Thu, 26 Aug 2010 17:38:43 +0200 Thomas Arendsen Hein Fix merge-tools.checkconflicts
Sat, 21 Aug 2010 10:48:49 -0500 Matt Mackall merge with stable
Sat, 21 Aug 2010 10:41:29 -0500 Matt Mackall merge: move reverse-merge logic out of filemerge (issue2342) stable
Wed, 18 Aug 2010 18:18:26 -0400 Steve Losh util: add an interpolate() function to for replacing multiple values
Tue, 27 Jul 2010 23:40:46 +0900 Nicolas Dumazet filectx: use cmp(self, fctx) instead of cmp(self, text)
Mon, 10 May 2010 11:04:56 -0500 David Champion merge: tool.check = prompt will force an interactive merge check
Mon, 10 May 2010 11:04:56 -0500 David Champion merge: introduce tool.check parameter
Wed, 21 Apr 2010 11:57:45 -0500 David Champion merge: tool.premerge=keep will leave premerge markers in $local
Mon, 19 Apr 2010 20:41:53 +0200 Benoit Boissinot filemerge: use working dir parent as ancestor for backward wdir merge stable
Tue, 23 Feb 2010 23:19:09 +0100 Patrick Mezard filemerge: use native path separators when merging (issue1399) stable
Fri, 05 Feb 2010 18:50:08 +0100 Benoit Boissinot fix spaces/identation issues
Mon, 25 Jan 2010 00:05:27 -0600 Matt Mackall many, many trivial check-code fixups
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
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
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
less more | (0) -60 tip