| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
file |
diff |
annotate
|
| Thu, 07 Nov 2019 13:18:19 -0500 |
Augie Fackler |
cleanup: remove pointless r-prefixes on double-quoted strings
|
file |
diff |
annotate
|
| Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
| Mon, 07 Oct 2019 00:04:04 -0400 |
Gregory Szorc |
py3: finish porting iteritems() to pycompat and remove source transformer
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 16:55:18 -0400 |
Gregory Szorc |
py3: manually import getattr where it is needed
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 13:28:56 -0400 |
Gregory Szorc |
py3: manually import pycompat.open into files that need it
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:14:37 -0800 |
Martin von Zweigbergk |
filemerge: migrate to scmutil.backuppath()
|
file |
diff |
annotate
|
| Wed, 30 Jan 2019 12:05:43 -0800 |
Martin von Zweigbergk |
merge: respect ui.relative-paths
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
file |
diff |
annotate
|
| Wed, 29 Aug 2018 22:53:44 -0400 |
Matt Harbison |
filemerge: fix an i18n comment typo
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
file |
diff |
annotate
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
file |
diff |
annotate
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
file |
diff |
annotate
|
| Wed, 22 Aug 2018 14:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: avoid putting translated text into docstring
|
file |
diff |
annotate
|
| Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 22:20:28 +0900 |
FUJIWARA Katsunori |
filemerge: show actual capabilities of internal merge tools
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 20:15:51 +0900 |
FUJIWARA Katsunori |
filemerge: add the function to examine a capability of a internal tool
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 20:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: set actual capabilities of internal merge tools
|
file |
diff |
annotate
|
| Mon, 23 Jul 2018 22:51:53 -0700 |
Martin von Zweigbergk |
mergetool: warn if ui.merge points to nonexistent tool
|
file |
diff |
annotate
|
| Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:20:36 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkdtemp() to use bytes path
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:14:04 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkstemp() to use bytes path
|
file |
diff |
annotate
|
| Thu, 24 May 2018 15:56:47 -0600 |
hindlemail |
filemerge: don't pass function name as loadpath's module_name param
|
file |
diff |
annotate
|
| Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
file |
diff |
annotate
|