Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 35483:817a3d20dd01
age | author | description |
---|---|---|
Fri, 22 Dec 2017 21:19:29 +0900 | Yuya Nishihara | templater: register keywords to defaults table |
Fri, 22 Dec 2017 21:22:49 +0900 | Yuya Nishihara | templater: drop unneeded resources from conflict-marker data |
Thu, 21 Dec 2017 22:05:30 +0900 | Yuya Nishihara | templater: move repo, ui and cache to per-engine resources |
Wed, 20 Dec 2017 17:22:16 -0600 | Phil Cohen | filemerge: only raise InMemoryMergeConflictsError when running _xmerge |