comparison tests/test-issue660.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 9910f60a37ee
children 8b190adb7ee3
comparison
equal deleted inserted replaced
16600:b54f3c502e63 16601:0c98820be15c