Mercurial > hg
diff tests/test-merge-no-file-change.t @ 39928:f07ab9ddc0c0
resolve: rename {status} to {mergestatus} to not shadow change status (BC)
This is a part of the name unification. I think it's somewhat useful to
provide a combined view of change/merge statuses.
https://www.mercurial-scm.org/wiki/GenericTemplatingPlan#Dictionary
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 30 Sep 2018 15:15:27 +0900 |
parents | 46da52f4b820 |
children | 8988e640a8ac |