Mercurial > hg
comparison tests/test-merge-changedelete.t @ 35482:c240657febb7
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 | 1b5c61d38a52 |
| children | 41ef02ba329b |
comparison
equal
deleted
inserted
replaced
| 35481:964510dcdc2a | 35482:c240657febb7 |
|---|