Mercurial > hg

diff tests/test-diff-subdir.t @ 22896:7e9cbb9c6053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: use 'm' state in otherparent to reduce ambiguity In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Oct 2014 13:31:06 -0500
parents f2719b387380
children e22248f6d257
line wrap: on
line diff