Mercurial > hg
log mercurial/simplemerge.py @ 37180:922b3fae9c7d
| age | author | description |
|---|---|---|
| Thu, 22 Mar 2018 21:56:20 +0900 | Yuya Nishihara | stringutil: bulk-replace call sites to point to new module |
| Sun, 10 Dec 2017 04:48:24 +0530 | Pulkit Goyal | py3: handle keyword arguments correctly in simplemerge.py |
| Fri, 01 Sep 2017 10:35:43 -0700 | Phil Cohen | simplemerge: remove unused `repo` parameter |
| Fri, 25 Aug 2017 13:49:17 -0700 | Phil Cohen | simplemerge: refactor _picklabels to be more compact |
| Fri, 25 Aug 2017 13:49:16 -0700 | Phil Cohen | simplemerge: remove check for null context |
| Thu, 24 Aug 2017 21:30:51 -0700 | Phil Cohen | simplemerge: simplify code now that we always write to a context |
| Thu, 24 Aug 2017 21:30:51 -0700 | Phil Cohen | simplemerge: make context parameters non-optional |