| 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
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
| Tue, 05 May 2015 10:51:34 +0900 |
Yuya Nishihara |
merge: concatenate default conflict marker at parsing phase of .py
|
| Sun, 10 Apr 2016 17:23:09 +0900 |
Yuya Nishihara |
templater: factor out function that creates templater from string template
|
| Sun, 03 Apr 2016 23:26:48 +0900 |
Yuya Nishihara |
templater: separate function to create templater from map file (API)
|
| Thu, 17 Mar 2016 00:36:01 +0000 |
timeless |
filemerge: use revset notation for p1/p2 of local/other descriptions
|
| Thu, 17 Mar 2016 00:36:01 +0000 |
timeless |
filemerge: indicate that local/other are p1/p2
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
origpath: move from cmdutil to scmutil
|
| Wed, 23 Dec 2015 12:51:45 -0800 |
Siddharth Agarwal |
filemerge: default change/delete conflicts to 'leave unresolved' (BC)
|
| Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
