Mercurial > hg

comparison tests/test-merge1.t @ 35482:c240657febb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: drop unneeded resources from conflict-marker data Follow-up for 32c278eb876f and f1c54d003327.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 22 Dec 2017 21:22:49 +0900
parents 2a774cae3a03
children 8c6775e812d8
comparison
equal deleted inserted replaced
35481:964510dcdc2a 35482:c240657febb7