comparison setup.py @ 13875:ff3c683eb8ff

rebase: use merge's ancestor parameter
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 15:30:54 -0500
parents 16118b4859a1
children 861f28212398
comparison
equal deleted inserted replaced
13874:9d67277c9204 13875:ff3c683eb8ff