| Sun, 10 Dec 2017 04:48:24 +0530 |
Pulkit Goyal |
py3: handle keyword arguments correctly in simplemerge.py
|
file |
diff |
annotate
|
| Fri, 01 Sep 2017 10:35:43 -0700 |
Phil Cohen |
simplemerge: remove unused `repo` parameter
|
file |
diff |
annotate
|
| Fri, 25 Aug 2017 13:49:17 -0700 |
Phil Cohen |
simplemerge: refactor _picklabels to be more compact
|
file |
diff |
annotate
|
| Fri, 25 Aug 2017 13:49:16 -0700 |
Phil Cohen |
simplemerge: remove check for null context
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: simplify code now that we always write to a context
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: make context parameters non-optional
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: stop accepting, and passing, file parameters
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:37 -0700 |
Phil Cohen |
simplemerge: stop reading from, and writing to, files
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:30:37 -0700 |
Phil Cohen |
simplemerge: use context paths for default labels instead of file paths
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 21:26:40 -0700 |
Phil Cohen |
simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 22:46:16 -0700 |
Phil Cohen |
filemerge: extract `_picklabels` as a helper function
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 22:46:03 -0700 |
Phil Cohen |
simplemerge: write merge result to the localctx, if passed
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: use contexts to read file data from, if passed
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: add optional context parameters to simplemerge
|
file |
diff |
annotate
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
simplemerge: extract verifytext as a helper function
|
file |
diff |
annotate
|
| Thu, 22 Jun 2017 03:16:16 +0530 |
Pulkit Goyal |
py3: convert kwargs' keys' to str using pycompat.strkwargs()
|
file |
diff |
annotate
|
| Thu, 02 Mar 2017 13:30:58 +0100 |
Pierre-Yves David |
vfs: use 'vfs' module directly in 'mercurial.simplemerge'
|
file |
diff |
annotate
|
| Thu, 02 Mar 2017 03:52:36 +0100 |
Pierre-Yves David |
vfs: replace 'scmutil.opener' usage with 'scmutil.vfs'
|
file |
diff |
annotate
|
| Mon, 17 Oct 2016 23:16:55 +0200 |
Mads Kiilerich |
spelling: fixes of non-dictionary words
|
file |
diff |
annotate
|
| Thu, 20 Oct 2016 22:09:50 +0900 |
Yuya Nishihara |
simplemerge: obtain stdout from ui
|
file |
diff |
annotate
|
| Wed, 10 Feb 2016 09:06:08 -0800 |
Ryan McElroy |
merge: minimize conflicts when common base is not shown (issue4447)
|
file |
diff |
annotate
|
| Wed, 10 Feb 2016 08:25:03 -0800 |
Ryan McElroy |
merge: introduce method to minimize merge regions
|
file |
diff |
annotate
|
| Tue, 09 Feb 2016 15:25:09 -0800 |
Ryan McElroy |
merge: add some useful documentation
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Wed, 12 Aug 2015 08:53:01 -0400 |
Jordi Gutiérrez Hermoso |
simplemerge: enable option to resolve conflicts one way
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 00:00:34 +0200 |
Erik Huelsmann |
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 19:54:11 -0700 |
Gregory Szorc |
simplemerge: use absolute_import
|
file |
diff |
annotate
|
| Thu, 07 Aug 2014 12:51:45 -0400 |
Jordi Gutiérrez Hermoso |
simplemerge: remove dead code
|
file |
diff |
annotate
|
| Tue, 05 Aug 2014 15:10:50 -0700 |
Pierre-Yves David |
simplemerge: support three labels when merging
|
file |
diff |
annotate
|