Mercurial > hg

diff tests/test-add.t @ 44906:e5043679bfcc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft-state: save --base in graft's state, fixing bug with graft --continue Without this change, running graft --continue after grafting a merge commit using --base (and encountering conflicts) will output "skipping ungraftable merge revision" even though we specified a base in the initial graft command. Graft's improve behaviour is reflected in test-graft.t. Differential Revision: https://phab.mercurial-scm.org/D8578
author Charles Chamberlain <cchamberlain@janestreet.com>
date Tue, 26 May 2020 11:14:07 -0400
parents 824b687ff6af
children 8d72e29ad1e0
line wrap: on
line diff