diff tests/test-merge9.t @ 13875:ff3c683eb8ff

rebase: use merge's ancestor parameter
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 15:30:54 -0500
parents 3b165c127690
children 2371f4aea665
line wrap: on
line diff