Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 33991:aaa65baf460c
age | author | description |
---|---|---|
Thu, 24 Aug 2017 21:30:51 -0700 | Phil Cohen | simplemerge: stop accepting, and passing, file parameters |
Sun, 13 Aug 2017 20:06:52 -0700 | Phil Cohen | filemerge: pass contexts to simplemerge |
Sun, 06 Aug 2017 01:13:57 +0900 | FUJIWARA Katsunori | filemerge: move decorator definition for internal merge tools to registrar |
Fri, 30 Jun 2017 03:44:56 +0200 | Boris Feld | configitems: register the 'ui.mergemarkertemplate' config |
Fri, 14 Jul 2017 14:22:40 -0700 | Jun Wu | codemod: register core configitems using a script |
Mon, 26 Jun 2017 22:52:15 -0700 | Phil Cohen | filemerge: convert a couple of wvfs calls in internal mergetools to contexts |
Sat, 22 Apr 2017 19:56:47 +0900 | Yuya Nishihara | templater: add simple interface for unnamed template (API) |