comparison tests/test-convert-baz.out @ 16601:0c98820be15c

filectx: handle some other simple cases for finding merge ancestor
author Matt Mackall <mpm@selenic.com>
date Sun, 06 May 2012 14:20:53 -0500
parents 7616ff5f3596
children
comparison
equal deleted inserted replaced
16600:b54f3c502e63 16601:0c98820be15c