| Fri, 19 May 2017 03:47:43 -0700 |
Stanislau Hlebik |
filemerge: store error messages in module variables
|
| Sat, 13 May 2017 03:31:42 +0900 |
FUJIWARA Katsunori |
filemerge: add internal merge tool to dump files forcibly
|
| Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: make warning message more i18n friendly
|
| Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: show warning about choice of :prompt only at an actual fallback
|
| Sat, 25 Feb 2017 19:36:02 +0900 |
Yuya Nishihara |
filemerge: optionally strip quotes from merge marker template (BC)
|
| Wed, 15 Mar 2017 15:11:52 -0700 |
Pierre-Yves David |
filemerge: explicitly tests for None
|
| Mon, 26 Dec 2016 16:54:33 -0700 |
Gregory Szorc |
filemerge: don't use mutable default argument value
|
| Mon, 06 Mar 2017 03:19:40 -0800 |
Simon Farnsworth |
filemerge: tag merge tool for blocked times
|
| Mon, 13 Feb 2017 20:06:38 +0530 |
Pulkit Goyal |
py3: convert the mode argument of os.fdopen to unicodes (1 of 2)
|
| Thu, 09 Feb 2017 09:32:25 -0800 |
Martin von Zweigbergk |
merge: print status message before launching external merge tool
|
| Sun, 18 Dec 2016 01:54:36 +0530 |
Pulkit Goyal |
py3: replace os.environ with encoding.environ (part 3 of 5)
|
| Wed, 23 Nov 2016 23:47:38 +0100 |
Mads Kiilerich |
merge: use original file extension for temporary files
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
| Thu, 10 Nov 2016 16:33:07 -0500 |
Augie Fackler |
filemerge: avoid shadowing a variable in a list comprehension
|
| Sat, 08 Oct 2016 16:10:58 +0200 |
Pulkit Goyal |
py3: make format strings unicodes and not bytes
|
