comparison mercurial/ancestor.py @ 12956:0406682c6905

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Nov 2010 17:29:23 -0600
parents 4cdaf1adafc8
children 22565ddb28e7
comparison
equal deleted inserted replaced
12954:85777aab7e08 12956:0406682c6905