Mercurial > hg

diff tests/test-largefiles-misc.t @ 22897:8fe74328f700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: merge falls through to otherparent This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Oct 2014 14:05:09 -0500
parents 4e2559841d6c
children e53f6b72a0e4 96d335e4eacb
line wrap: on
line diff