diff tests/test-diff-newlines.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 5abc47d4ca6b
children 55c6ebd11cb9
line wrap: on
line diff