Mon, 04 Feb 2019 21:14:37 -0800 |
Martin von Zweigbergk |
filemerge: migrate to scmutil.backuppath()
|
Wed, 30 Jan 2019 12:05:43 -0800 |
Martin von Zweigbergk |
merge: respect ui.relative-paths
|
Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
Wed, 29 Aug 2018 22:53:44 -0400 |
Matt Harbison |
filemerge: fix an i18n comment typo
|
Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
Wed, 22 Aug 2018 14:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: avoid putting translated text into docstring
|
Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
Tue, 14 Aug 2018 22:20:28 +0900 |
FUJIWARA Katsunori |
filemerge: show actual capabilities of internal merge tools
|
Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
Tue, 14 Aug 2018 20:15:51 +0900 |
FUJIWARA Katsunori |
filemerge: add the function to examine a capability of a internal tool
|