mercurial/simplemerge.py
e7aa113b14f77959ad4039d873b57100a4d56b31
created 2018-08-01 13:00 -0700
pushed 2018-08-03 01:30 +0000
Gregory Szorc Gregory Szorc - global: use pycompat.xrange()
f0b6fbea00cfb0997d96b6ec71bec4d2b1b3e96a
created 2018-03-22 21:56 +0900
pushed 2018-03-24 00:21 +0000
Yuya Nishihara Yuya Nishihara - stringutil: bulk-replace call sites to point to new module
93c4958d987c1cb3c7d67ab1001c49b0012c6985
created 2017-12-10 04:48 +0530
pushed 2017-12-10 03:14 +0000
Pulkit Goyal Pulkit Goyal - py3: handle keyword arguments correctly in simplemerge.py
6330df9d6393eeb4ec67c484122086b44cf54cc7
created 2017-09-01 10:35 -0700
pushed 2017-09-14 04:21 +0000
Phil Cohen Phil Cohen - simplemerge: remove unused `repo` parameter
39d253d088a978857e010d2887f3caa581fa5eef
created 2017-08-25 13:49 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: refactor _picklabels to be more compact
3b2a002ef6850a1233afcca547bc136f64717f31
created 2017-08-25 13:49 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: remove check for null context
4074de97b512a0c828b91b3295c317f8ba4a5f68
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: simplify code now that we always write to a context
1ad3085239ad7458c05575565927107dfd58e408
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: make context parameters non-optional
fa6309c5761dbe55781df0e99c71eb30ec17ab85
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: stop accepting, and passing, file parameters
61b267a99fea8d7f6b9fa6dceade50044709df1d
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: stop reading from, and writing to, files
1915a5e809ca8a2b938e82765ce0dec1bba64cff
created 2017-08-24 21:30 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: use context paths for default labels instead of file paths
f39ba8237ed60fbd338be2df6f44bbcc49dd36c4
created 2017-08-24 21:26 -0700
pushed 2017-08-31 22:34 +0000
Phil Cohen Phil Cohen - simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
aa6c290a77fa91c3dc7d30da3367a47a1c1c41e9
created 2017-08-13 22:46 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - filemerge: extract `_picklabels` as a helper function
b86fc43e4b73422ec74975f8f7dc36c74e2a9885
created 2017-08-13 22:46 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - simplemerge: write merge result to the localctx, if passed
8b91a4ff23adb337e9525441ca09571acc5a7cfe
created 2017-08-13 20:06 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - simplemerge: use contexts to read file data from, if passed
b3571dc0e6b8ddc21d5ba9c13acf9dd08ffae74b
created 2017-08-13 20:06 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - simplemerge: add optional context parameters to simplemerge
de573184686e01c9d56c0ee79d0bcdc81e310370
created 2017-08-13 20:06 -0700
pushed 2017-08-19 05:07 +0000
Phil Cohen Phil Cohen - simplemerge: extract verifytext as a helper function
c31d456233046581c04485a2a71b7ffe628f537c
created 2017-06-22 03:16 +0530
pushed 2017-06-24 07:33 +0000
Pulkit Goyal Pulkit Goyal - py3: convert kwargs' keys' to str using pycompat.strkwargs()
35284f9335184d8455ca4a53b1dca521824c51e8
created 2017-03-02 13:30 +0100
pushed 2017-03-09 22:10 +0000
Pierre-Yves David Pierre-Yves David - vfs: use 'vfs' module directly in 'mercurial.simplemerge'
21fa3d3688f3ecde3a5ffd8b8b4597019c2c75f1
created 2017-03-02 03:52 +0100
pushed 2017-03-09 22:10 +0000
Pierre-Yves David Pierre-Yves David - vfs: replace 'scmutil.opener' usage with 'scmutil.vfs'
318a24b52eebd9e7739ae0595306aafd1624e81b
created 2016-10-17 23:16 +0200
pushed 2016-11-10 17:46 +0000
Mads Kiilerich Mads Kiilerich - spelling: fixes of non-dictionary words
5f7d13d3bd4daa34fb64b447879a4630295a557c
created 2016-10-20 22:09 +0900
pushed 2016-11-09 01:22 +0000
Yuya Nishihara Yuya Nishihara - simplemerge: obtain stdout from ui
ef1eb6df70714ed097e4fcd7abcf9b4a715ded59
created 2015-10-09 13:54 -0700
pushed 2015-10-13 22:29 +0000
Siddharth Agarwal Siddharth Agarwal - simplemerge: move conflict warning message to filemerge
56b2bcea252913e4a2d2772d2f35cd7e07b37f12
created 2015-10-08 12:55 -0700
pushed 2015-10-13 18:48 +0000
Pierre-Yves David Pierre-Yves David - error: get Abort from 'error' instead of 'util'
ed12abab068eccec965d8ccf3a78a42b20c78762
created 2015-08-12 08:53 -0400
pushed 2015-09-13 01:57 +0000
Jordi Gutiérrez Hermoso Jordi Gutiérrez Hermoso - simplemerge: enable option to resolve conflicts one way
09d6725cbc602e232aa34eb6fffb81639b951529
created 2015-08-16 00:00 +0200
pushed 2015-09-01 19:23 +0000
Erik Huelsmann Erik Huelsmann - simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
d7618b9f0003936ef1afafbf516eabd4fd9b3843
created 2015-06-21 22:56 -0700
pushed 2015-06-22 07:28 +0000
Gregory Szorc Gregory Szorc - simplemerge: use absolute imports
83df50a8d61cc08a76fcb78d797cf9ec7631c0c9
created 2014-08-07 12:51 -0400
pushed 2015-03-18 16:34 +0000
Jordi Gutiérrez Hermoso Jordi Gutiérrez Hermoso - simplemerge: remove dead code
372ae2745acfd93b891b622cf116992c166d443e
created 2014-08-05 15:10 -0700
pushed 2015-03-18 16:34 +0000
Pierre-Yves David Pierre-Yves David - simplemerge: support three labels when merging
f1883065181115355251cc33ba200f72dd3cdae6
created 2014-08-05 14:56 -0700
pushed 2015-03-18 16:34 +0000
Pierre-Yves David Pierre-Yves David - simplemerge: burn "minimal" feature to the ground
4aeb7a6029bafb4847bb27604a97d70ea1ee0fde
created 2014-05-08 16:33 -0700
pushed 2015-03-18 16:34 +0000
Durham Goode Durham Goode - merge: prevent simplemerge from mutating label list
e34106fa0dc37f32bb72b2ff3ea615d01d255732
created 2012-05-12 16:00 +0200
pushed 2015-03-18 16:34 +0000
Brodie Rao Brodie Rao - cleanup: "raise SomeException()" -> "raise SomeException"
525fdb7389757cdb7dbbac1ef865d79dc0ea789c
created 2012-05-12 15:54 +0200
pushed 2015-03-18 16:34 +0000
Brodie Rao Brodie Rao - cleanup: eradicate long lines
7de7630053cb492c1d2cf53d6b36cc22d20f8c6b
created 2012-01-06 16:27 +0100
pushed 2015-03-18 16:34 +0000
Martin Geisler Martin Geisler - Remove FSF mailing address from GPL headers
c519cd8f0169f530eea221837bbce9fce8e46be3
created 2011-10-29 11:02 -0500
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - backout dbdb777502dc (issue3077) (issue3071) stable
dbdb777502dc509c1e98e30d694ac12dcdc64659
created 2011-10-24 13:51 +0200
pushed 2015-03-18 16:34 +0000
Thomas Arendsen Hein Thomas Arendsen Hein - consistency: use util.realpath instead of os.path.realpath where useful stable
774da7121fc999f6e8f963bb9a671e010e4e63fb
created 2011-08-25 20:21 -0400
pushed 2015-03-18 16:34 +0000
Greg Ward Greg Ward - atomictempfile: make close() consistent with other file-like objects.
48ec0763afbbbbb4802fb836ae75256e82e5609c
created 2011-06-07 17:02 -0500
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - check-code: catch misspellings of descendant
abaacdab38f64e3f7f27d8bc6ec251c76dfcc30e
created 2011-05-15 13:15 -0500
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - merge with stable
3c65cdcf3ba6cdaa75e7b9e6eb8ef0ff0d3db197
created 2011-05-13 19:46 -0500
pushed 2015-03-18 16:34 +0000
Steve Borho Steve Borho - simplemerge: do not allow binary files to abort an entire merge stable
d139133553901fc394019291cacf49ec6c64446c
created 2011-04-20 19:54 +0200
pushed 2015-03-18 16:34 +0000
Adrian Buehlmann Adrian Buehlmann - move opener from util to scmutil
4cdaf1adafc80ab9d63a12b27699b378142a5004
created 2010-09-24 12:46 -0500
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - backout most of 4f8067c94729
4f8067c9472952251d4b5a5979f7b59af92381c5
created 2010-09-23 00:02 -0500
pushed 2015-03-18 16:34 +0000
Brodie Rao Brodie Rao - cleanup: use x in (a, b) instead of x == a or x == b
81c4e18c7ceef6638249f8b03fb5c7679266bace
created 2010-08-26 22:51 +0200
pushed 2015-03-18 16:34 +0000
Mads Kiilerich Mads Kiilerich - simplemerge: remove hash-bang from non-executable script stable
08a0f04b56bd3061d2fe5e639be0d00b6da7e71b
created 2010-01-25 00:05 -0600
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - many, many trivial check-code fixups
b87a50b7125c6c2f14314e6393435b2b98679ae0
created 2009-04-28 17:40 +0200
pushed 2015-03-18 16:34 +0000
Simon Heimberg Simon Heimberg - separate import lines from mercurial and general python modules
bb9f13974d8e32ab3c3df5cdaa01b61da58c1d5b
created 2009-04-30 23:57 -0500
pushed 2015-03-18 16:34 +0000
Steve Borho Steve Borho - simplemerge: use ui.warn() for warnings
810ca383da9c3cc24d4bd16037f6e88998483f01
created 2008-10-28 19:25 +0100
pushed 2015-03-18 16:34 +0000
Benoit Boissinot Benoit Boissinot - remove unused variables
e75aab656f466e3170fc727d8c1ed7694e75f642
created 2008-03-06 22:23 +0100
pushed 2015-03-18 16:34 +0000
Joel Rosdahl Joel Rosdahl - Remove unused imports
abd66eb0889e3efaca4f960e0eacd719c18880dd
created 2008-02-03 19:29 -0600| base
pushed 2015-03-18 16:34 +0000
Matt Mackall Matt Mackall - merge: move the bulk of simplemerge into core
less more (0) tip