comparison tests/test-ancestor.py.out @ 25247:f2b98dacb37d

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 May 2015 11:50:57 -0500
parents 3b1b8f25443e
children b6db2e80a9ce
comparison
equal deleted inserted replaced
25245:504ef9c49f4a 25247:f2b98dacb37d