annotate tests/bundles/rebase-revset.hg @ 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 6cb6064f1d50
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15270
6cb6064f1d50 rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 (binary:application/octet-stream)