Mercurial > hg

diff tests/test-merge-local.t @ 20943:003cb972178d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: include ancestor node in merge actions
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:38:33 +0100
parents 2371f4aea665
children ef1eb6df7071
line wrap: on
line diff