Mercurial > hg

diff tests/test-merge5.t @ 21390:26b84128c54d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move constant assignments a bit and use them more
author Mads Kiilerich <madski@unity3d.com>
date Thu, 15 May 2014 02:14:59 +0200
parents 41abe2e3e3b7
children fe80fdf68ba7
line wrap: on
line diff