Mercurial > hg

comparison tests/test-merge-tools.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 38e0363dcbe0
children 9d0b6ef92eb2
comparison
equal deleted inserted replaced
22896:7e9cbb9c6053 22897:8fe74328f700