Mercurial > hg

diff tests/test-merge9.t @ 12664:545ec1775021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 3b165c127690
children 2371f4aea665
line wrap: on
line diff