| Fri, 26 Oct 2012 12:02:58 -0700 |
Keegan Carruthers-Smith |
filemerge: use util.shellquote when calling merge (issue3581)
stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 16:29:13 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 15:12:26 -0500 |
Matt Mackall |
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559
stable
|
file |
diff |
annotate
|
| Thu, 01 Mar 2012 17:45:13 +0100 |
Thomas Arendsen Hein |
merge with stable
|
file |
diff |
annotate
|
| Thu, 01 Mar 2012 17:35:12 +0100 |
Thomas Arendsen Hein |
filemerge: remove temporary files when using internal:dump as merge-tool
stable
|
file |
diff |
annotate
|
| Thu, 16 Feb 2012 15:58:51 -0600 |
Matt Mackall |
filemerge: remove some redundancy in decorators/docstrings
|
file |
diff |
annotate
|
| Sun, 12 Feb 2012 21:38:12 +0900 |
FUJIWARA Katsunori |
filemerge: create detail of internal merge tools from documentation string
|
file |
diff |
annotate
|
| Sun, 12 Feb 2012 21:38:12 +0900 |
FUJIWARA Katsunori |
filemerge: refactoring of 'filemerge()'
|
file |
diff |
annotate
|
| Wed, 21 Dec 2011 18:20:15 +0100 |
Laurens Holst |
context: add isbinary function
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Wed, 12 Oct 2011 21:45:58 -0400 |
Greg Ward |
merge: expand environment variables and ~/ in tool.executable
|
file |
diff |
annotate
|
| Fri, 24 Jun 2011 17:04:37 +0300 |
Idan Kamara |
filemerge: use ui out descriptor when calling util.system
stable
|
file |
diff |
annotate
|
| Sun, 08 May 2011 20:35:46 +0200 |
Adrian Buehlmann |
rename util.find_exe to findexe
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:16:22 +0200 |
Adrian Buehlmann |
rename util.lookup_reg to lookupreg
|
file |
diff |
annotate
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 13:05:18 -0600 |
Steve Borho |
filemerge: introduce a 'regkeyalt' merge tool variable
stable
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
file |
diff |
annotate
|
| Thu, 26 Aug 2010 17:55:07 +0200 |
Thomas Arendsen Hein |
merge with stable
|
file |
diff |
annotate
|
| Thu, 26 Aug 2010 17:38:43 +0200 |
Thomas Arendsen Hein |
Fix merge-tools.checkconflicts
stable
|
file |
diff |
annotate
|
| Thu, 26 Aug 2010 17:38:43 +0200 |
Thomas Arendsen Hein |
Fix merge-tools.checkconflicts
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:48:49 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:41:29 -0500 |
Matt Mackall |
merge: move reverse-merge logic out of filemerge (issue2342)
stable
|
file |
diff |
annotate
|
| Wed, 18 Aug 2010 18:18:26 -0400 |
Steve Losh |
util: add an interpolate() function to for replacing multiple values
|
file |
diff |
annotate
|
| Tue, 27 Jul 2010 23:40:46 +0900 |
Nicolas Dumazet |
filectx: use cmp(self, fctx) instead of cmp(self, text)
|
file |
diff |
annotate
|
| Mon, 10 May 2010 11:04:56 -0500 |
David Champion |
merge: tool.check = prompt will force an interactive merge check
|
file |
diff |
annotate
|
| Mon, 10 May 2010 11:04:56 -0500 |
David Champion |
merge: introduce tool.check parameter
|
file |
diff |
annotate
|
| Wed, 21 Apr 2010 11:57:45 -0500 |
David Champion |
merge: tool.premerge=keep will leave premerge markers in $local
|
file |
diff |
annotate
|
| Mon, 19 Apr 2010 20:41:53 +0200 |
Benoit Boissinot |
filemerge: use working dir parent as ancestor for backward wdir merge
stable
|
file |
diff |
annotate
|
| Tue, 23 Feb 2010 23:19:09 +0100 |
Patrick Mezard |
filemerge: use native path separators when merging (issue1399)
stable
|
file |
diff |
annotate
|
| Fri, 05 Feb 2010 18:50:08 +0100 |
Benoit Boissinot |
fix spaces/identation issues
|
file |
diff |
annotate
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
file |
diff |
annotate
|
| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
file |
diff |
annotate
|
| Wed, 04 Nov 2009 15:18:19 +0100 |
Sune Foldager |
merge: supply base node to merge tools in the environment
|
file |
diff |
annotate
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
file |
diff |
annotate
|
| Tue, 07 Jul 2009 17:26:20 +0200 |
Martin Geisler |
filemerge, subrepo: correct indention
|
file |
diff |
annotate
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
file |
diff |
annotate
|
| Sat, 20 Jun 2009 16:42:51 -0500 |
Matt Mackall |
filemerge: fix internal:dump
|
file |
diff |
annotate
|
| Thu, 18 Jun 2009 16:56:03 -0500 |
Matt Mackall |
filemerge: add internal:dump
|
file |
diff |
annotate
|
| Thu, 18 Jun 2009 16:56:02 -0500 |
Matt Mackall |
filemerge: add internal:prompt target
|
file |
diff |
annotate
|
| Sun, 24 May 2009 22:37:20 +0200 |
Martin Geisler |
use ui instead of repo.ui when the former is in scope
|
file |
diff |
annotate
|
| Sun, 24 May 2009 02:56:14 -0500 |
Matt Mackall |
match: add some default args
|
file |
diff |
annotate
|
| Sun, 24 May 2009 02:56:14 -0500 |
Matt Mackall |
match: change all users of util.matcher to match.match
|
file |
diff |
annotate
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
file |
diff |
annotate
|
| Thu, 30 Apr 2009 23:57:36 -0500 |
Steve Borho |
simplemerge: use ui.warn() for warnings
|
file |
diff |
annotate
|
| Thu, 30 Apr 2009 10:15:32 -0500 |
Steve Borho |
ui: replace regexp pattern with sequence of choices
|
file |
diff |
annotate
|
| Sun, 26 Apr 2009 01:08:54 +0200 |
Martin Geisler |
updated license to be explicit about GPL version 2
|
file |
diff |
annotate
|
| Sun, 26 Apr 2009 16:50:44 -0500 |
Matt Mackall |
replace util.sort with sorted built-in
|
file |
diff |
annotate
|
| Mon, 23 Mar 2009 13:12:07 +0100 |
Peter Arrenbrecht |
cleanup: drop unused imports
|
file |
diff |
annotate
|
| Fri, 07 Nov 2008 02:47:12 +0100 |
Mads Kiilerich |
More verbose logging when filemerge searches for merge-tool
|
file |
diff |
annotate
|
| Fri, 27 Jun 2008 18:28:45 -0500 |
Matt Mackall |
util: add sort helper
|
file |
diff |
annotate
|
| Thu, 26 Jun 2008 13:52:16 -0500 |
Matt Mackall |
context: remove islink and isexec methods
|
file |
diff |
annotate
|
| Thu, 26 Jun 2008 13:46:34 -0500 |
Matt Mackall |
simplify flag handling
|
file |
diff |
annotate
|
| Sun, 13 Apr 2008 11:31:45 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Fri, 04 Apr 2008 02:21:53 +0300 |
Dov Feldstern |
use internal merge tool when specified for a merge-pattern in hgrc
|
file |
diff |
annotate
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:41 +0100 |
Joel Rosdahl |
Remove unused imports
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
file |
diff |
annotate
|
| Wed, 06 Feb 2008 20:44:25 -0600 |
Steve Borho |
filemerge: more backwards compatible behavior for ui.merge
|
file |
diff |
annotate
|
| Wed, 06 Feb 2008 20:32:06 -0600 |
Steve Borho |
filemerge: add 'checkchanged' merge tool property
|
file |
diff |
annotate
|
| Mon, 04 Feb 2008 19:38:34 -0600 |
Steve Borho |
filemerge: wrap quotes around tool path
|
file |
diff |
annotate
|