comparison tests/test-subrepo.t @ 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 4fe8eb4a6e2c
children 6ef3107c661e
comparison
equal deleted inserted replaced
16600:b54f3c502e63 16601:0c98820be15c